From afb1e2e3bb580077c6c917e6ea98baad8f3c39b3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 May 2005 08:27:59 +0000 Subject: * ported/cleaned up the "Automatic dependency handling" patch from Michael Hofmann --- apt-pkg/depcache.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c6bf3185a..5da411e4d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -16,6 +16,10 @@ #include #include #include + +#include +#include +#include #include /*}}}*/ @@ -72,7 +76,10 @@ bool pkgDepCache::Init(OpProgress *Prog) // Find the proper cache slot StateCache &State = PkgState[I->ID]; State.iFlags = 0; - + State.DirtyState = pkgCache::State::RemoveUnknown; + //State.AutomaticRemove = I->AutomaticRemove; + State.AutomaticRemove = pkgCache::State::RemoveUnknown; + // Figure out the install version State.CandidateVer = GetCandidateVer(I); State.InstallVer = I.CurrentVer(); @@ -447,6 +454,35 @@ void pkgDepCache::Update(OpProgress *Prog) AddStates(I); } + // read the state file ------------------------------ + FileFd state_file; + string state = _config->FindDir("Dir::State") + "pkgstates"; + if(FileExists(state)) { + state_file.Open(state, FileFd::ReadOnly); + int file_size = state_file.Size(); + Prog->OverallProgress(0, file_size, 1, _("Reading extended state information")); + + pkgTagFile tagfile(&state_file); + pkgTagSection section; + int amt=0; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + // Silently ignore unknown packages and packages with no actual + // version. + if(!pkg.end() && !pkg.VersionList().end()) { + short reason = section.FindI("Remove-Reason", pkgCache::State::RemoveManual); + PkgState[pkg->ID].AutomaticRemove = reason; + //std::cout << "Set: " << pkgname << " to " << reason << std::endl; + amt+=section.size(); + Prog->OverallProgress(amt, file_size, 1, _("Reading extended state information")); + } + Prog->OverallProgress(file_size, file_size, 1, _("Reading extended state information")); + } + } + //-------------------------------------- + + if (Prog != 0) Prog->Progress(Done); } @@ -582,7 +618,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) else P.Mode = ModeDelete; P.InstallVer = 0; - P.Flags &= Flag::Auto; + // This was not inverted before, but I think it should be + P.Flags &= ~Flag::Auto; AddStates(Pkg); Update(Pkg); @@ -754,6 +791,15 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) AddSizes(Pkg); } /*}}}*/ +// DepCache::SetDirty - Switch the package between dirty states /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgDepCache::SetDirty(PkgIterator const &Pkg, pkgCache::State::PkgRemoveState To) +{ + StateCache &P = PkgState[Pkg->ID]; + P.DirtyState = To; +} + /*}}}*/ // DepCache::SetCandidateVersion - Change the candidate version /*{{{*/ // --------------------------------------------------------------------- /* */ -- cgit v1.2.3-70-g09d2 From a83d884db24933000f19dbff706529db057d50c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Jun 2005 16:40:54 +0000 Subject: * cleanups --- apt-pkg/depcache.cc | 91 ++++++++++++++++++++++++++++++++++++----------------- apt-pkg/depcache.h | 4 +++ cmdline/apt-get.cc | 23 ++------------ 3 files changed, 69 insertions(+), 49 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5da411e4d..552a45a16 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -20,7 +20,7 @@ #include #include #include - +#include #include /*}}}*/ @@ -103,6 +103,66 @@ bool pkgDepCache::Init(OpProgress *Prog) } /*}}}*/ +bool pkgDepCache::readStateFile(OpProgress *Prog) +{ + FileFd state_file; + string state = _config->FindDir("Dir::State") + "pkgstates"; + if(FileExists(state)) { + state_file.Open(state, FileFd::ReadOnly); + int file_size = state_file.Size(); + Prog->OverallProgress(0, file_size, 1, + _("Reading extended state information")); + + pkgTagFile tagfile(&state_file); + pkgTagSection section; + int amt=0; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + // Silently ignore unknown packages and packages with no actual + // version. + if(!pkg.end() && !pkg.VersionList().end()) { + short reason = section.FindI("Remove-Reason", + pkgCache::State::RemoveManual); + PkgState[pkg->ID].AutomaticRemove = reason; + //std::cout << "Set: " << pkgname << " to " << reason << std::endl; + amt+=section.size(); + Prog->OverallProgress(amt, file_size, 1, + _("Reading extended state information")); + } + Prog->OverallProgress(file_size, file_size, 1, + _("Reading extended state information")); + } + } + + return true; +} + +bool pkgDepCache::writeStateFile(OpProgress *prog) +{ + // write the auto-mark list ---------------------------------- + + FileFd StateFile; + string state = _config->FindDir("Dir::State") + "pkgstates"; + + if(!StateFile.Open(state, FileFd::WriteEmpty)) + return _error->Error(_("Failed to write StateFile %s"), + state.c_str()); + + std::ostringstream ostr; + for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) { + if(PkgState[pkg->ID].AutomaticRemove != pkgCache::State::RemoveUnknown) { + ostr.str(string("")); + ostr << "Package: " << pkg.Name() + << "\nRemove-Reason: " + << (int)(PkgState[pkg->ID].AutomaticRemove) << "\n\n"; + StateFile.Write(ostr.str().c_str(), ostr.str().size()); + //std::cout << "Writing auto-mark: " << ostr.str() << endl; + } + } + return true; +} + // DepCache::CheckDep - Checks a single dependency /*{{{*/ // --------------------------------------------------------------------- /* This first checks the dependency against the main target package and @@ -454,34 +514,7 @@ void pkgDepCache::Update(OpProgress *Prog) AddStates(I); } - // read the state file ------------------------------ - FileFd state_file; - string state = _config->FindDir("Dir::State") + "pkgstates"; - if(FileExists(state)) { - state_file.Open(state, FileFd::ReadOnly); - int file_size = state_file.Size(); - Prog->OverallProgress(0, file_size, 1, _("Reading extended state information")); - - pkgTagFile tagfile(&state_file); - pkgTagSection section; - int amt=0; - while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); - pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); - // Silently ignore unknown packages and packages with no actual - // version. - if(!pkg.end() && !pkg.VersionList().end()) { - short reason = section.FindI("Remove-Reason", pkgCache::State::RemoveManual); - PkgState[pkg->ID].AutomaticRemove = reason; - //std::cout << "Set: " << pkgname << " to " << reason << std::endl; - amt+=section.size(); - Prog->OverallProgress(amt, file_size, 1, _("Reading extended state information")); - } - Prog->OverallProgress(file_size, file_size, 1, _("Reading extended state information")); - } - } - //-------------------------------------- - + readStateFile(Prog); if (Prog != 0) Prog->Progress(Done); diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index f974bfacf..e02ed72f0 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -198,6 +198,10 @@ class pkgDepCache : protected pkgCache::Namespace // This is for debuging void Update(OpProgress *Prog = 0); + + // read persistent states + bool readStateFile(OpProgress *prog); + bool writeStateFile(OpProgress *prog); // Size queries inline double UsrSize() {return iUsrSize;}; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 31148a807..9f9ecd375 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -994,25 +994,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Error(_("Aborting install.")); } - // write the auto-mark list ---------------------------------- // -- we do it here because there is no libapt::Commit() :/ - FileFd state_file; - string state = _config->FindDir("Dir::State") + "pkgstates"; - - - state_file.Open(state, FileFd::WriteEmpty); - std::ostringstream ostr; - for(pkgCache::PkgIterator p=Cache->PkgBegin(); !p.end();p++) { - if(Cache[p].AutomaticRemove != pkgCache::State::RemoveUnknown) { - ostr.str(string("")); - ostr << "Package: " << p.Name() - << "\nRemove-Reason: " - << (int)(Cache[p].AutomaticRemove) << "\n\n"; - state_file.Write(ostr.str().c_str(), ostr.str().size()); - //std::cout << "Writing auto-mark: " << ostr.str() << endl; - } - } - // ---------------------------------------------------------- + Cache->writeStateFile(NULL); _system->UnLock(); pkgPackageManager::OrderResult Res = PM->DoInstall(); @@ -1720,8 +1703,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; - //if (_config->FindB("APT::Get::AutomaticRemove")) - Cache[I].AutomaticRemove = pkgCache::State::RemoveRequired; + // mark each pkg as auto-installed + Cache[I].AutomaticRemove = pkgCache::State::RemoveRequired; VersionsList += string(Cache[I].CandVersion) + "\n"; } } -- cgit v1.2.3-70-g09d2 From 80fa0d8a1a77f4dab696dcf11d1908ecda761fab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Jun 2005 09:36:22 +0000 Subject: * moved most of the real work into depcache::writeStateFile --- apt-pkg/algorithms.cc | 11 +++++++++++ apt-pkg/depcache.cc | 11 +++++++++++ cmdline/apt-get.cc | 6 ++---- 3 files changed, 24 insertions(+), 4 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 479927d65..2799c2fdd 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1061,6 +1061,17 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) return _error->Error(_("Unable to correct problems, you have held broken packages.")); } + // set the auto-flags (mvo: I'm not sure if we _really_ need this, but + // I didn't managed + pkgCache::PkgIterator I = Cache.PkgBegin(); + for (;I.end() != true; I++) { + if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { + std::cout << "Resolve installed new pkg: " << I.Name() << " (now marking it as auto)" << std::endl; + Cache[I].Flags |= pkgCache::Flag::Auto; + } + } + + return true; } /*}}}*/ diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 552a45a16..c490d89bc 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -151,6 +151,17 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) { + + // clear out no longer installed pkg + if(PkgState[pkg->ID].Delete() || pkg.CurrentVer() == NULL) + PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveUnknown; + + // check if we have new information + if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) { + std::cout << "pkg: " << pkg.Name() << " is auto-dep" << std::endl; + PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveRequired; + } + if(PkgState[pkg->ID].AutomaticRemove != pkgCache::State::RemoveUnknown) { ostr.str(string("")); ostr << "Package: " << pkg.Name() diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9f9ecd375..bc8cd1ae5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1703,10 +1703,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; - // mark each pkg as auto-installed - Cache[I].AutomaticRemove = pkgCache::State::RemoveRequired; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); -- cgit v1.2.3-70-g09d2 From 3c9b111f0fea7b57f1eebc2c03a057240e9b7a06 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Jun 2005 19:46:26 +0000 Subject: * merged with the apt--improved-do-install patch Patches applied: * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-88 * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--patch-1 * merged with apt--fixes to make it build * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--patch-2 * added "DoInstall{Pre,Post}Fork()" --- apt-pkg/depcache.cc | 3 +- apt-pkg/packagemanager.cc | 18 --- apt-pkg/packagemanager.h | 36 ++++- po/apt-all.pot | 333 +++++++++++++++++++++++----------------------- 4 files changed, 205 insertions(+), 185 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c490d89bc..269fe8543 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -140,7 +140,8 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) bool pkgDepCache::writeStateFile(OpProgress *prog) { - // write the auto-mark list ---------------------------------- + // FIXME: this function needs to be called inside the commit() + // of the package manager. so after FileFd StateFile; string state = _config->FindDir("Dir::State") + "pkgstates"; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a97c94fdf..71a0dd034 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -627,21 +627,3 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Completed; } /*}}}*/ -// PM::DoInstall - Does the installation /*{{{*/ -// --------------------------------------------------------------------- -/* This uses the filenames in FileNames and the information in the - DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall() -{ - OrderResult Res = OrderInstall(); - if (Res != Failed) - if (Go() == false) - return Failed; - - // if all was fine update the state file - if(Res == Completed) - Cache.writeStateFile(NULL); - - return Res; -} - /*}}}*/ diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 43f2c4ace..da1f21e6c 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -29,6 +29,7 @@ #include #include +#include using std::string; @@ -70,13 +71,44 @@ class pkgPackageManager : protected pkgCache::Namespace virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;}; virtual bool Go(int statusFd=-1) {return true;}; virtual void Reset() {}; - + + // the result of the operation + OrderResult Res; + public: // Main action members bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs); - OrderResult DoInstall(); + + // Do the installation + OrderResult DoInstall() { + if(DoInstallPreFork() == Failed) + return Failed; + + return DoInstallPostFork(); + } + + // stuff that needs to be done before the fork() of a library that + // uses apt + OrderResult DoInstallPreFork() { + Res = OrderInstall(); + return Res; + }; + + // stuff that needs to be done after the fork + OrderResult DoInstallPostFork(int statusFd=-1) { + bool goResult = Go(statusFd); + if(goResult == false) + return Failed; + + // if all was fine update the state file + if(Res == Completed) + Cache.writeStateFile(NULL); + + return Res; + }; + bool FixMissing(); pkgPackageManager(pkgDepCache *Cache); diff --git a/po/apt-all.pot b/po/apt-all.pot index ff044cf6c..d043210fe 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-09 19:02+0200\n" +"POT-Creation-Date: 2005-06-24 21:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2438 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -231,7 +231,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@ -519,275 +519,275 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1594 +#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1526 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:345 msgid " or" msgstr "" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:545 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:659 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:856 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1894 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1858 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1975 cmdline/apt-get.cc:2186 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:819 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:822 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:826 +#: cmdline/apt-get.cc:827 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:830 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 +#: cmdline/apt-get.cc:847 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:864 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:865 +#: cmdline/apt-get.cc:866 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:887 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1335 cmdline/apt-get.cc:2015 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:977 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:2093 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2024 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:984 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:988 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:993 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:994 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1026 +#: cmdline/apt-get.cc:1027 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1037 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1054 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1065 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1078 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1088 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -795,97 +795,97 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1107 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1110 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1129 +#: cmdline/apt-get.cc:1130 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1138 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1165 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1167 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1172 +#: cmdline/apt-get.cc:1173 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1283 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1296 cmdline/apt-get.cc:1431 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1353 +#: cmdline/apt-get.cc:1354 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1372 -msgid "Internal error, AllUpgrade broke stuff" -msgstr "" - -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1367 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1389 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1488 cmdline/apt-get.cc:1662 +#: cmdline/apt-get.cc:1392 cmdline/apt-get.cc:1594 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1492 +#: cmdline/apt-get.cc:1396 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1581 cmdline/apt-get.cc:1617 +#: cmdline/apt-get.cc:1414 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1513 cmdline/apt-get.cc:1549 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1604 +#: cmdline/apt-get.cc:1536 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1634 +#: cmdline/apt-get.cc:1566 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1637 +#: cmdline/apt-get.cc:1569 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1649 +#: cmdline/apt-get.cc:1581 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -893,145 +893,145 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1657 +#: cmdline/apt-get.cc:1589 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1665 +#: cmdline/apt-get.cc:1597 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1697 +#: cmdline/apt-get.cc:1628 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1699 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1769 +#: cmdline/apt-get.cc:1700 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1720 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1792 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1723 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1797 +#: cmdline/apt-get.cc:1728 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:1901 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1997 cmdline/apt-get.cc:2204 +#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2044 +#: cmdline/apt-get.cc:1975 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2049 +#: cmdline/apt-get.cc:1980 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:1983 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:1989 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2089 +#: cmdline/apt-get.cc:2020 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:2048 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2129 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2165 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2229 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2281 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2368 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2407 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2411 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2443 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2484 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1229,7 +1229,7 @@ msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" +msgid "Failed to write file %s" msgstr "" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1315,9 +1315,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 +#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 +#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@ -1372,7 +1372,7 @@ msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 @@ -1575,7 +1575,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1702,43 +1702,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" @@ -2021,7 +2021,7 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:64 apt-pkg/depcache.cc:95 +#: apt-pkg/depcache.cc:64 apt-pkg/depcache.cc:96 msgid "Building dependency tree" msgstr "" @@ -2029,14 +2029,19 @@ msgstr "" msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:96 +#: apt-pkg/depcache.cc:97 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:461 apt-pkg/depcache.cc:473 apt-pkg/depcache.cc:475 +#: apt-pkg/depcache.cc:114 apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:134 msgid "Reading extended state information" msgstr "" +#: apt-pkg/depcache.cc:150 +#, c-format +msgid "Failed to write StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@ -2185,82 +2190,82 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:131 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:152 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:156 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:186 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:190 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:194 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:243 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:256 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" -- cgit v1.2.3-70-g09d2 From 20edfd5399dada2d10ad791336797c4118eb60a8 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 20:13:10 +0000 Subject: Merge with mainline Patches applied: * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- apt-pkg/deb/debindexfile.cc | 4 ++-- apt-pkg/deb/deblistparser.cc | 11 +++++++++-- apt-pkg/deb/deblistparser.h | 3 ++- apt-pkg/depcache.cc | 3 +++ debian/changelog | 5 ++++- debian/control | 2 +- 6 files changed, 21 insertions(+), 7 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index f26265fff..ff8bce85d 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -24,7 +24,7 @@ #include #include #include - + #include /*}}}*/ @@ -290,7 +290,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const FileFd Rel(ReleaseFile,FileFd::ReadOnly); if (_error->PendingError() == true) return false; - Parser.LoadReleaseInfo(File,Rel); + Parser.LoadReleaseInfo(File,Rel,Section); } return true; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 96a80582d..25b533773 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -564,13 +564,20 @@ bool debListParser::Step() // --------------------------------------------------------------------- /* */ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, - FileFd &File) + FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX pkgTagSection Section; if (Tags.Step(Section) == false) return false; + //mvo: I don't think we need to fill that in (it's unused since apt-0.6) + //FileI->Architecture = WriteUniqString(Arch); + + // apt-secure does no longer download individual (per-section) Release + // file. to provide Component pinning we use the section name now + FileI->Component = WriteUniqString(component); + const char *Start; const char *Stop; if (Section.Find("Suite",Start,Stop) == true) @@ -589,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Section.FindFlag("NotAutomatic",FileI->Flags, pkgCache::Flag::NotAutomatic) == false) _error->Warning("Bad NotAutomatic flag"); - + return !_error->PendingError(); } /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 9f305211a..3a0e0421b 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -55,7 +55,8 @@ class debListParser : public pkgCacheGenerator::ListParser virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File); + bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + string section); static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c6bf3185a..dd1c794c9 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -91,6 +91,9 @@ bool pkgDepCache::Init(OpProgress *Prog) } Update(Prog); + + if(Prog != 0) + Prog->Done(); return true; } diff --git a/debian/changelog b/debian/changelog index a249d92f4..d71a78e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ apt (0.6.38) unstable; urgency=low - debian/rules: install all keyrings * Add the current Debian archive signing key (4F368D5D) to debian-archive.gpg - + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 apt (0.6.37) breezy; urgency=low diff --git a/debian/control b/debian/control index b7c430997..9dd271619 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman +Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) -- cgit v1.2.3-70-g09d2 From e004867d0979224adb9cbeb9705f156e16e3fe26 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Jun 2005 16:29:16 +0000 Subject: * merged with mainline Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- apt-pkg/algorithms.cc | 11 +- apt-pkg/deb/debindexfile.cc | 4 +- apt-pkg/deb/deblistparser.cc | 11 +- apt-pkg/deb/deblistparser.h | 3 +- apt-pkg/depcache.cc | 3 + cmdline/apt-key | 6 +- configure.in | 2 +- debian/apt.postinst | 2 +- debian/changelog | 26 ++++ debian/control | 4 +- debian/rules | 2 +- po/da.po | 111 +++++++------- po/de.po | 53 +++---- po/fr.po | 339 +++++++++++++++++++++++++++++++++++++------ po/he.po | 3 +- po/pt.po | 59 +++----- po/pt_BR.po | 149 ++++++++++--------- share/debian-archive.gpg | Bin 477 -> 1303 bytes 18 files changed, 523 insertions(+), 265 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 98bd8dd8b..dd16b5dc8 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1330,11 +1330,12 @@ void pkgMarkPkgUsed(pkgDepCache &Cache, pkgCache::PkgIterator Pkg, bool pkgMarkUsed(pkgDepCache &Cache) { // debug only - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) - if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0) - std::cout << "has auto-remove information: " << Pkg.Name() - << " " << (int)Cache[Pkg].AutomaticRemove - << std::endl; + if(_config->FindI("Debug::pkgAutoRemove",false) == true) + for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) + if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0) + std::cout << "has auto-remove information: " << Pkg.Name() + << " " << (int)Cache[Pkg].AutomaticRemove + << std::endl; // init with defaults for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index f26265fff..ff8bce85d 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -24,7 +24,7 @@ #include #include #include - + #include /*}}}*/ @@ -290,7 +290,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const FileFd Rel(ReleaseFile,FileFd::ReadOnly); if (_error->PendingError() == true) return false; - Parser.LoadReleaseInfo(File,Rel); + Parser.LoadReleaseInfo(File,Rel,Section); } return true; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 96a80582d..25b533773 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -564,13 +564,20 @@ bool debListParser::Step() // --------------------------------------------------------------------- /* */ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, - FileFd &File) + FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX pkgTagSection Section; if (Tags.Step(Section) == false) return false; + //mvo: I don't think we need to fill that in (it's unused since apt-0.6) + //FileI->Architecture = WriteUniqString(Arch); + + // apt-secure does no longer download individual (per-section) Release + // file. to provide Component pinning we use the section name now + FileI->Component = WriteUniqString(component); + const char *Start; const char *Stop; if (Section.Find("Suite",Start,Stop) == true) @@ -589,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Section.FindFlag("NotAutomatic",FileI->Flags, pkgCache::Flag::NotAutomatic) == false) _error->Warning("Bad NotAutomatic flag"); - + return !_error->PendingError(); } /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 9f305211a..3a0e0421b 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -55,7 +55,8 @@ class debListParser : public pkgCacheGenerator::ListParser virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File); + bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + string section); static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 269fe8543..54cfcb8bb 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -98,6 +98,9 @@ bool pkgDepCache::Init(OpProgress *Prog) } Update(Prog); + + if(Prog != 0) + Prog->Done(); return true; } diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..0685e36f7 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-keyring package installed?" exit 1 fi diff --git a/configure.in b/configure.in index 806e4b6ef..a8c170d3f 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.37") +AC_DEFINE_UNQUOTED(VERSION,"0.6.38") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index 7717705d3..ad775c230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +apt (0.6.39) unstable; urgency=low + + * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 + * Merge mvo's changes from 0.6.36ubuntu1: + michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 + * Merge aggregated translation updates: + bubulle@debian.org--2005/apt--main--0 + * Update priority of apt-utils to important, to match the override file + + -- + +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/control b/debian/control index b7c430997..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman +Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin diff --git a/debian/rules b/debian/rules index e3254c2d2..d6ae540ee 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/*.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog diff --git a/po/da.po b/po/da.po index feade5c60..7d8f3508f 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-10 20:50+0100\n" +"PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr " Rene virtuelle pakker: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Enkelt-virtuelle pakker: " +msgstr " Enkelte virtuelle pakker: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@ -259,7 +259,7 @@ msgstr "" " shell - Skal-tilstand\n" " dump - Vis opsætningen\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjælpetekst.\n" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" @@ -287,7 +287,7 @@ msgstr "" "apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-" "oplysninger fra Debianpakker\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjælpetekst\n" " -t Angiv temp-mappe\n" " -c=? Læs denne opsætningsfil\n" @@ -327,7 +327,6 @@ msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -400,10 +399,10 @@ msgstr "" " -h Denne hjælpetekst\n" " --md5 Styr generering af MD5\n" " -s=? Kilde-tvangsfil\n" -" -q Stille (vis færre statusbeskeder)\n" +" -q Stille\n" " -d=? Vælg den valgfrie mellemlager-database\n" -" --no-delink Aktivér \"delinking\" fejlsporingstilstand\n" -" --contents Bestem generering af inholdsfil\n" +" --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" " -c=? Læs denne opsætningsfil\n" " -o=? Sæt en opsætnings-indstilling" @@ -600,7 +599,7 @@ msgstr "Kunne ikke udf #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "dekompressions-program" +msgstr "dekomprimerings-program" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" @@ -669,7 +668,7 @@ msgstr "F #: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" -msgstr "Følgende pakker vil blive FJERNET:" +msgstr "Følgende pakker vil blive AFINSTALLERET:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" @@ -697,33 +696,33 @@ msgid "" "WARNING: The following essential packages will be removed\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ADVARSEL: Følgende essentielle pakker vil blive fjernet\n" +"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" #: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu opgraderede, %lu netop installerede, " +msgstr "%lu opgraderes, %lu nyinstalleres, " #: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " -msgstr "%lu geninstallerede, " +msgstr "%lu geninstalleres, " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " -msgstr "%lu nedgraderede, " +msgstr "%lu nedgraderes, " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu at fjerne og %lu ikke opgraderede.\n" +msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ikke fuldstændigt installerede eller fjernede.\n" +msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." @@ -771,7 +770,7 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "Pakker skal fjernes, men Remove er deaktiveret." +msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" @@ -882,7 +881,7 @@ msgstr "" #: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pakken %s er ikke installeret, så den fjernes ikke\n" +msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n" #: cmdline/apt-get.cc:1065 #, c-format @@ -1197,13 +1196,13 @@ msgstr "" " update - Hent nye lister over pakker\n" " upgrade - Udfør en opgradering\n" " install - Installér nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Fjern pakker\n" +" remove - Afinstallér pakker\n" " source - Hent kildetekstarkiver\n" " build-dep - Sæt opbygningsafhængigheder op for kildetekstpakker\n" " dist-upgrade - Distributionsopgradering, se apt-get(8)\n" " dselect-upgrade - Følg valgene fra dselect\n" -" clean - Fjern hentede arkivfiler\n" -" autoclean - Fjern gamle hentede arkivfiler\n" +" clean - Slet hentede arkivfiler\n" +" autoclean - Slet gamle hentede arkivfiler\n" " check - Tjek at der ikke er uopfyldte afhængigheder\n" "\n" "Tilvalg:\n" @@ -1283,7 +1282,7 @@ msgstr "" "apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n" "bruges til at angive filens type.\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjælpetekst\n" " -s Benyt kildefils-sortering\n" " -c=? Læs denne opsætningsfil\n" @@ -1367,7 +1366,7 @@ msgstr "Kunne ikke l #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode kaldt med endnu-forbundet knude" +msgstr "DropNode kaldt med endnu forbundet knude" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1467,7 +1466,7 @@ msgstr "Kunne ikke finde %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Kunne ikke fjerne %s" +msgstr "Kunne ikke slette %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1544,7 +1543,8 @@ msgid "Internal error adding a diversion" msgstr "Intern fejl under tilføjelse af omrokering" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +#, fuzzy +msgid "The pkg cache must be initialize first" msgstr "pkg-mellemlageret skal initialiseres først" #: apt-inst/deb/dpkgdb.cc:386 @@ -2234,17 +2234,17 @@ msgstr "Ugyldig linje %lu i kildelisten %s (dist)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (URI parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ugyldig linje %lu i kildelisten %s (absolute dist)" +msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (dist parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2269,7 +2269,7 @@ msgstr "Typen '%s' er ukendt p #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ugyldig linje %u i kildelisten %s (vendor id)" +msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2278,9 +2278,10 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Kørsel af denne installation kræver midlertidig fjernelse af den essentielle " -"pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig idé, men hvis " -"du virkelig vil gøre det, kan du aktivere valget 'APT::Force-LoopBreak'." +"Kørsel af denne installation kræver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig " +"idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-" +"LoopBreak'." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2371,38 +2372,38 @@ msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2420,13 +2421,13 @@ msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occured while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2452,11 +2453,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2465,7 +2466,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2474,13 +2475,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" diff --git a/po/de.po b/po/de.po index d95c9b87e..3cb0cc23e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2004-08-04 15:58 +0200\n" +"PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" -msgstr "Paketerweiterungsliste is zu lang" +msgstr "Paketerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 @@ -315,7 +315,7 @@ msgstr "Fehler beim Verarbeiten von Verzeichnis %s" #: ftparchive/apt-ftparchive.cc:250 msgid "Source extension list is too long" -msgstr "Quellerweiterungsliste is zu lang" +msgstr "Quellerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:367 msgid "Error writing header to contents file" @@ -376,29 +376,22 @@ msgstr "" " generate config [gruppen]\n" " clean config\n" "\n" -"apt-ftparchive generiert Indexdateien fÃŒr Debian-Archive. Es unterstÃŒtzt " -"viele\n" +"apt-ftparchive generiert Indexdateien fÃŒr Debian-Archive. Es unterstÃŒtzt viele\n" "verschiedene Arten der Generierung, von vollautomatisch bis hin zu den\n" "funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" "\n" -"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die " -"Package-\n" -"Datei enthÀlt die Inhalt aller Kontrollfelder aus jedem Paket sowie einen " -"MD5-\n" -"Hashwert und die Dateigröße. Eine Override-Datei wird unterstÃŒtzt, um Werte " -"fÃŒr\n" +"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die Package-\n" +"Datei enthÀlt die Inhalt aller Kontrollfelder aus jedem Paket sowie einen MD5-\n" +"Hashwert und die Dateigröße. Eine Override-Datei wird unterstÃŒtzt, um Werte fÃŒr\n" "PrioritÀt und Sektion zu erzwingen.\n" "\n" -"Auf ganz Àhnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem " -"Baum\n" -"von .dscs. Die Option --source-override kann benutzt werden, um eine " -"Override-\n" +"Auf ganz Àhnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem Baum\n" +"von .dscs. Die Option --source-override kann benutzt werden, um eine Override-\n" "Datei fÃŒr Quellen anzugeben.\n" "\n" -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " -"aufgerufen\n" +"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes aufgerufen\n" "werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n" -"overridefile sollte die Override-Flags enthalten. PfadprÀfix wird wird, so\n" +"overridefile sollte die Override-Flags enthalten. PfadprÀfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -1973,7 +1966,7 @@ msgstr "Auswahl %s nicht gefunden" #: apt-pkg/contrib/configuration.cc:395 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nicht erkannte TypabkÃŒrzung: ‚%c‘" +msgstr "Nicht erkannte TypabkÃŒrzung: »%c«" #: apt-pkg/contrib/configuration.cc:453 #, c-format @@ -2070,7 +2063,7 @@ msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option ‚%s‘ ist zu lang" +msgstr "Option »%s« ist zu lang" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2257,27 +2250,27 @@ msgstr "Kann Paketdatei %s nicht parsen (2)" #: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" #: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»absolute dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2287,22 +2280,22 @@ msgstr "%s wird geöffnet" #: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." -msgstr "Zeile %u zu lang in der Quelliste %s." +msgstr "Zeile %u zu lang in der Quellliste %s." #: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»type«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quelliste %s" +msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»vendor id«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2630,7 +2623,7 @@ msgstr "" "geschrieben.\n" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quelliste %s" +#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" #~ msgid "" #~ "Some broken packages were found while trying to process build-" diff --git a/po/fr.po b/po/fr.po index 8644bf55c..d317a2a80 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,4 +1,3 @@ -# translation of fr-save.po to French # translation of fr.po to French # Advanced Package Transfer - APT message translation catalog # French messages @@ -10,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-03-29 09:40+0200\n" +"PO-Revision-Date: 2005-05-26 00:44+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -302,7 +301,8 @@ msgstr "Impossible d' #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" @@ -379,7 +379,7 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n" -"gère de nombreux types de génération, d'une automatisation complète à\n" +"supporte de nombreux types de génération, d'une automatisation complète à\n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n" @@ -389,7 +389,7 @@ msgstr "" "des sections\n" "\n" "De façon similaire, apt-ftparchive génère des fichiers de source à partir\n" -"d'un arbre de .dscs. L'option --source-override peut être utilisée pour\n" +"d'un arbre de .dscs. L'option --source-override peut être employée pour\n" "spécifier un fichier src d'« override »\n" "\n" "Les commandes « packages » et « sources » devraient être démarrées à la\n" @@ -418,7 +418,8 @@ msgstr "Aucune s #: ftparchive/apt-ftparchive.cc:830 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" #: ftparchive/cachedb.cc:45 #, c-format @@ -487,7 +488,7 @@ msgstr "Impossible d'ouvrir %s" #: ftparchive/writer.cc:246 #, c-format msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgstr " Délier %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format @@ -776,7 +777,8 @@ msgstr "Il y a des probl #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." +msgstr "" +"Les paquets doivent être enlevés mais la désinstallation est désactivée." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" @@ -800,7 +802,8 @@ msgstr "Il est n #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" +msgstr "" +"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" #: cmdline/apt-get.cc:829 #, c-format @@ -866,7 +869,8 @@ msgstr "" #: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." @@ -928,7 +932,8 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -982,7 +987,8 @@ msgstr "Note, s #: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" +msgstr "" +"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" #: cmdline/apt-get.cc:1518 msgid "" @@ -1146,7 +1152,8 @@ msgstr "Impossible de satisfaire les d #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" @@ -1329,7 +1336,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "précédant ce message sont importantes. Veuillez les corriger et\n" "démarrer l'[I]nstallation une nouvelle fois." @@ -1560,7 +1568,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une déviation" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +msgid "The pkg cache must be initialize first" msgstr "Le cache des paquets doit être initialisé en premier" #: apt-inst/deb/dpkgdb.cc:386 @@ -1590,7 +1598,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1688,7 +1697,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +msgstr "" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format @@ -1725,7 +1735,8 @@ msgstr "Impossible de cr #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé" +msgstr "" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -2136,7 +2147,7 @@ msgstr "lu(s), %lu restant #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "écrit(s), %lu restant à écrire, mais l'ecriture est impossible" +msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" #: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" @@ -2259,12 +2270,14 @@ msgstr "Ligne %lu mal form #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2284,12 +2297,14 @@ msgstr "Ligne %u mal form #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "" +"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2310,7 +2325,8 @@ msgstr "Le type de fichier d'index #: apt-pkg/algorithms.cc:241 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." @@ -2365,7 +2381,8 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list" +msgstr "" +"Vous devez insérer quelques adresses « sources » dans votre sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2398,65 +2415,64 @@ msgstr "Le cache poss #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occurred while processing %s (NewPackage)" +msgid "Error occured while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" +msgid "Error occured while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" +msgid "Error occured while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Error occured while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" +msgid "Error occured while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" +msgid "Error occured while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Oula, vous avez dépassé le nombre de noms de paquets que cet APT est capable " -"de traiter." +"Vous avez dépassé le nombre de noms de paquets que cet APT est capable de " +"traiter." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Oula, vous avez dépassé le nombre de versions que cet APT est capable de " -"traiter." +"Vous avez dépassé le nombre de versions que cet APT est capable de traiter." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Oula, vous avez dépassé le nombre de dépendances que cet APT est capable de " +"Vous avez dépassé le nombre de dépendances que cet APT est capable de " "traiter." #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occurred while processing %s (FindPkg)" +msgid "Error occured while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2477,18 +2493,19 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2498,7 +2515,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2507,14 +2524,15 @@ msgstr "" "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Taille incohérente" @@ -2619,8 +2637,237 @@ msgstr "" "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" +#~ msgid "Total Package Names : " +#~ msgstr "Nombre total de paquets : " + +#~ msgid " Normal Packages: " +#~ msgstr " Paquets ordinaires : " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Paquets entièrement virtuels : " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Paquets virtuels simples : " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Paquets virtuels mixtes : " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Nombre de versions distinctes : " + +#~ msgid "Total Dependencies: " +#~ msgstr "Nombre de dépendances : " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Nombre de relations version/fichier : " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Nombre de relations « Provides » : " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Nombre de motifs rationnels : " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Espace occupé par les versions des dépendances : " + +#~ msgid "Total Slack space: " +#~ msgstr "Espace disque gaspillé : " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Total de l'espace attribué : " + +#~ msgid "Package Files:" +#~ msgstr "Fichiers du paquet :" + +#~ msgid "Pinned Packages:" +#~ msgstr "Paquets étiquetés :" + +#~ msgid " Package Pin: " +#~ msgstr " Étiquette de paquet : " + +#~ msgid " Version Table:" +#~ msgstr " Table de version :" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Erreur lors du traitement du répertoire %s" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Erreur du traitement du contenu %s" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Algorithme de compression « %s » inconnu" + +#~ msgid "Compress Child" +#~ msgstr "Fils compressé" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Erreur interne, impossible de créer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent être enlevés mais la désinstallation est désactivée." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Souhaitez-vous continuer ? [O/n] " + +#~ msgid "Aborting Install." +#~ msgstr "Annulation de l'installation." + +#~ msgid "Internal Error, AllUpgrade broke stuff" +#~ msgstr "Erreur interne, AllUpgrade a cassé le boulot !" + +#~ msgid "Calculating Upgrade... " +#~ msgstr "Calcul de la mise à jour... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Récupération des sources %s\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Modules reconnus :" + +#~ msgid "" +#~ "Media Change: Please insert the disc labeled\n" +#~ " '%s'\n" +#~ "in the drive '%s' and press enter\n" +#~ msgstr "" +#~ "Changement de support : veuillez insérer le disque\n" +#~ "« %s »\n" +#~ "dans le lecteur « %s » et appuyez sur la touche Entrée\n" + +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Erreur interne dans AddDiversion" + +#~ msgid "Reading Package Lists" +#~ msgstr "Lecture des listes de paquets" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Erreur interne lors de l'obtention d'un nom de paquet" + +#~ msgid "Reading File Listing" +#~ msgstr "Lecture de la liste de fichiers" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Erreur interne lors de l'obtention d'un Nœud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une déviation" + +#~ msgid "Reading File List" +#~ msgstr "Lecture de la liste des fichiers" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Impossible de trouver un en-tête « Package: », décalage %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Erreur interne, ne peut localiser la partie %s" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Erreur interne, ne peut localiser le membre" + +#~ msgid "Unparsible control file" +#~ msgstr "Fichier de contrôle non traitable" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par " +#~ "votre APT. apt-get update ne peut être employé pour ajouter de nouveaux " +#~ "cédéroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cédérom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refusé notre connexion et a répondu : %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'écriture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possède un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clôture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tête de donnée" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u : balise mal formée" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'était pas présent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le système de version « %s »" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dépendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Génération des dépendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "Bloc de fournisseur %s invalide" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Identifiant « %s » du fournisseur inconnu dans la ligne %u de la liste " #~ "des sources %s" +#~ msgid "File Not Found" +#~ msgstr "Fichier non trouvé" + +#~ msgid "The pkg cache must be initialized first" +#~ msgstr "Le cache des paquets doit être initialisé en premier" + +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" diff --git a/po/he.po b/po/he.po index 242155eff..189370945 100644 --- a/po/he.po +++ b/po/he.po @@ -639,8 +639,7 @@ msgstr "לא משליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -"א ז ה ך ה: החבילות החיוניות הבאות יוסךו\n" -"על ה׀עולה להעשות *ךק* אם אתה יודע מה אתה עושה!" +"א ז ה ך ה: החבילות החיוניות הבאות יוסךו" #: cmdline/apt-get.cc:658 msgid " Done" diff --git a/po/pt.po b/po/pt.po index 21912759b..4b1568efe 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2602,54 +2602,35 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" -msgstr "A cache de pacotes tem de ser inicializada primeiro" +#~ msgid "The pkg cache must be initialized first" +#~ msgstr "A cache de pacotes tem de ser inicializada primeiro" -#: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "Um erro ocorreu ao processar %s (NovoPacote)" +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Um erro ocorreu ao processar %s (UsePacote1)" +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Um erro ocorreu ao processar %s (UsePacote2)" +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" +#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Um erro ocorreu ao processar %s (UsePacote3)" +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "Um erro ocorreu ao processar %s (FindPkg)" +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8e1525db7..82271928b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,13 +6,13 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-13 15:18-0200\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n" +"POT-Creation-Date: 2005-05-23 11:34+0200\n" +"PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "Erro processando Conteúdo %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,7 +377,7 @@ msgstr "" "suporta muitos estilos de geração, desde totalmente automatizadas até \n" "substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" "\n" -"O apt-ftparchive gera arquivos Packages a partir de uma árvore de .debs.\n" +"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n" " O arquivo Package contém o conteúdo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" "override é suportado para forçar o valor de Priority e Section.\n" @@ -623,7 +622,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -772,11 +771,11 @@ msgstr "H msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -834,7 +833,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" @@ -843,7 +842,7 @@ msgstr "Falha ao baixar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -946,7 +945,7 @@ msgstr "Vers msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" @@ -962,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +983,7 @@ msgstr "" "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +995,7 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,107 +1005,107 @@ msgstr "" "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando Atualização... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1114,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1123,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência %s para %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1549,7 +1548,7 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +msgid "The pkg cache must be initialize first" msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:386 @@ -1758,7 +1757,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1885,43 +1884,43 @@ msgstr "Este servidor http possui suporte a range quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Seleção falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexão" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conexão falhou." -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2384,37 +2383,37 @@ msgstr "O Cache possui um sistema de vers #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occurred while processing %s (NewPackage)" +msgid "Error occured while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" +msgid "Error occured while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" +msgid "Error occured while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Error occured while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVersão1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" +msgid "Error occured while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" +msgid "Error occured while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVersão2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2435,12 +2434,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occurred while processing %s (FindPkg)" +msgid "Error occured while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2466,11 +2465,11 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2480,7 +2479,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2489,7 +2488,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2497,7 +2496,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg index 0db59e674..c391d8fa1 100644 Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ -- cgit v1.2.3-70-g09d2 From 120365cee294d00706928b0327ac755ab3448eca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Jun 2005 08:41:51 +0000 Subject: * cleanups, documentation updates (don't show any debug output if no Debug::pkgAutomaticRemove was set, don't remove if not APT::Get::AutomaticRemove (--automatic-remove) was set) --- apt-pkg/algorithms.cc | 7 +++++-- apt-pkg/depcache.cc | 6 ++++-- cmdline/apt-get.cc | 9 +++++---- configure.in | 2 +- doc/examples/configure-index | 4 +++- 5 files changed, 18 insertions(+), 10 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index dd16b5dc8..5167d11eb 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1066,7 +1066,10 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; I++) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { - std::cout << "Resolve installed new pkg: " << I.Name() << " (now marking it as auto)" << std::endl; + if(_config->FindI("Debug::pkgAutoRemove",false)) { + std::clog << "Resolve installed new pkg: " << I.Name() + << " (now marking it as auto)" << std::endl; + } Cache[I].Flags |= pkgCache::Flag::Auto; } } @@ -1333,7 +1336,7 @@ bool pkgMarkUsed(pkgDepCache &Cache) if(_config->FindI("Debug::pkgAutoRemove",false) == true) for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0) - std::cout << "has auto-remove information: " << Pkg.Name() + std::clog << "has auto-remove information: " << Pkg.Name() << " " << (int)Cache[Pkg].AutomaticRemove << std::endl; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 54cfcb8bb..e30baa4b2 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -20,6 +20,8 @@ #include #include #include + +#include #include #include /*}}}*/ @@ -162,7 +164,8 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) // check if we have new information if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) { - std::cout << "pkg: " << pkg.Name() << " is auto-dep" << std::endl; + if(_config->FindI("Debug::pkgAutoRemove",false)) + std::clog << "pkg: " << pkg.Name() << " is auto-dep" << std::endl; PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveRequired; } @@ -172,7 +175,6 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) << "\nRemove-Reason: " << (int)(PkgState[pkg->ID].AutomaticRemove) << "\n\n"; StateFile.Write(ostr.str().c_str(), ostr.str().size()); - //std::cout << "Writing auto-mark: " << ostr.str() << endl; } } return true; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3bafd42ba..0236d7e77 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1361,7 +1361,8 @@ bool DoUpdate(CommandLine &CmdL) /* Remove unused automatic packages */ bool DoAutomaticRemove(CacheFile &Cache) { - std::cout << "DoAutomaticRemove()" << std::endl; + if(_config->FindI("Debug::pkgAutoRemove",false)) + std::cout << "DoAutomaticRemove()" << std::endl; if (_config->FindB("APT::Get::Remove",true) == false) return _error->Error(_("We are not supposed to delete stuff, can't " @@ -1597,10 +1598,10 @@ bool DoInstall(CommandLine &CmdL) return _error->Error(_("Broken packages")); } - //if (_config->FindB("APT::Get::AutomaticRemove")) { + if (_config->FindB("APT::Get::AutomaticRemove")) { if (!DoAutomaticRemove(Cache)) return false; - //} + } /* Print out a list of packages that are going to be installed extra to what the user asked */ @@ -2522,7 +2523,7 @@ int main(int argc,const char *argv[]) {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, - {0,"experimental-automatic-remove","APT::Get::AutomaticRemove",0}, + {0,"automatic-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, diff --git a/configure.in b/configure.in index a8c170d3f..fd3eac884 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.38") +AC_DEFINE_UNQUOTED(VERSION,"0.6.39") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a09ea0c37..31bc13430 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -29,6 +29,7 @@ APT Get { Arch-Only "false"; + AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@ -235,7 +236,8 @@ Debug pkgAcquire::Worker "false"; pkgDPkgPM "false"; pkgOrderList "false"; - + pkgAutoRemove "false"; // show information about automatic removes + pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic -- cgit v1.2.3-70-g09d2 From 0a57c0f0e4d0bc3474ce4d2101f36a997891d30d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jun 2005 06:11:36 +0000 Subject: * use mark-and-sweep from aptitude now as GC algorithm --- apt-pkg/algorithms.cc | 245 +++++++++++++++++++++++++++++++++----------------- apt-pkg/depcache.cc | 43 ++++----- apt-pkg/depcache.h | 16 ++-- apt-pkg/pkgcache.h | 1 - cmdline/apt-get.cc | 5 +- debian/changelog | 7 +- 6 files changed, 197 insertions(+), 120 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 5167d11eb..bed90f5d0 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -20,7 +20,10 @@ #include #include #include +#include +#include #include + #include @@ -1248,106 +1251,186 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) /*}}}*/ -// pkgMarkPkgUsed - Mark used packages as dirty /*{{{*/ -// --------------------------------------------------------------------- -/* Mark all reachable packages as dirty. */ -void pkgMarkPkgUsed(pkgDepCache &Cache, pkgCache::PkgIterator Pkg, - pkgCache::State::PkgRemoveState DirtLevel) +// mark a single package in Mark-and-Sweep +void pkgMarkPackage(pkgDepCache &Cache, + const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests) { - // If it is not installed, and we are in manual mode, ignore it - if ((Pkg->CurrentVer == 0 && Cache[Pkg].Install() == false || Cache[Pkg].Delete() == true) && - DirtLevel == pkgCache::State::RemoveManual) + pkgDepCache::StateCache &state=Cache[pkg]; + pkgCache::VerIterator candver=state.CandidateVerIter(Cache); + pkgCache::VerIterator instver=state.InstVerIter(Cache); + +#if 0 + // If a package was garbage-collected but is now being marked, we + // should re-select it + // For cases when a pkg is set to upgrade and this trigger the + // removal of a no-longer used dependency. if the pkg is set to + // keep again later it will result in broken deps + if(state.Delete() && state.RemoveReason=pkgDepCache::Unused) { -// fprintf(stdout,"This one is not installed/virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); - return; + if(ver==candver) + mark_install(pkg, false, false, NULL); + else if(ver==pkg.CurrentVer()) + MarkKeep(pkg); + + instver=state.InstVerIter(*this); } +#endif - // If it is not installed, and it is not virtual, ignore it - if ((Pkg->CurrentVer == 0 && Cache[Pkg].Install() == false || Cache[Pkg].Delete() == true) && - Pkg->VersionList != 0) - { -// fprintf(stdout,"This one is not installed %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); + // Ignore versions other than the InstVer, and ignore packages + // that are already going to be removed or just left uninstalled. + if(!(ver==instver && !instver.end())) return; - } - // If it is similar or more dirty than we are ;-), because we've been here already, don't mark it - // This is necessary because virtual packages just relay the current level, - // so it may be possible e.g. that this was already seen with ::RemoveSuggested, but - // we are ::RemoveRequired - if (Cache[Pkg].Dirty() >= DirtLevel) - { - //fprintf(stdout,"Seen already %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); + // if we are marked already we are done + if(state.Marked) return; - } - - // If it is less important than the current DirtLevel, don't mark it - if (Cache[Pkg].AutomaticRemove != pkgCache::State::RemoveManual && - Cache[Pkg].AutomaticRemove > DirtLevel) + + //std::cout << "Setting Marked for: " << pkg.Name() << std::endl; + state.Marked=true; + + if(!ver.end()) { -// fprintf(stdout,"We don't need %s %d %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel, Cache[Pkg].Dirty()); - return; + for(pkgCache::DepIterator d=ver.DependsList(); !d.end(); ++d) + { + if(d->Type==pkgCache::Dep::Depends || + d->Type==pkgCache::Dep::PreDepends || + (follow_recommends && + d->Type==pkgCache::Dep::Recommends) || + (follow_suggests && + d->Type==pkgCache::Dep::Suggests)) + { + // Try all versions of this package. + for(pkgCache::VerIterator V=d.TargetPkg().VersionList(); + !V.end(); ++V) + { + if(_system->VS->CheckDep(V.VerStr(),d->CompareOp, d.TargetVer())) + { + pkgMarkPackage(Cache, V.ParentPkg(), V, + follow_recommends, follow_suggests); + } + } + // Now try virtual packages + for(pkgCache::PrvIterator prv=d.TargetPkg().ProvidesList(); + !prv.end(); ++prv) + { + if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, + d.TargetVer())) + { + pkgMarkPackage(Cache, prv.OwnerPkg(), prv.OwnerVer(), + follow_recommends, follow_suggests); + } + } + } + } } +} - // Mark it as used - Cache.SetDirty(Pkg, DirtLevel); - - //fprintf(stdout,"We keep %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); - // We are a virtual package - if (Pkg->VersionList == 0) +bool pkgMarkUsed(pkgDepCache &Cache) +{ + bool follow_recommends; + bool follow_suggests; + + // init the states + for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) { -// fprintf(stdout,"We are virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); - for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); ! Prv.end(); ++Prv) - pkgMarkPkgUsed (Cache, Prv.OwnerPkg(), DirtLevel); - return; + Cache[p].Marked=false; + Cache[p].Garbage=false; } - // Depending on the type of dependency, follow it - for (pkgCache::DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); ! D.end(); ++D) - { -// fprintf(stdout,"We depend on %s %s\n", D.TargetPkg().Name(), D.DepType()); + // init vars + follow_recommends=_config->FindB("APT::AutoRemove::RecommendsImportant",false); + follow_suggests=_config->FindB("APT::AutoRemove::SuggestsImportend", false); - switch(D->Type) + + // do the mark part + for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) + { + if(Cache[p].InstallReason==pkgDepCache::Manual || + (p->Flags & pkgCache::Flag::Essential)) { - case pkgCache::Dep::Depends: - case pkgCache::Dep::PreDepends: - pkgMarkPkgUsed (Cache, D.TargetPkg(), pkgCache::State::RemoveRequired); - break; - case pkgCache::Dep::Recommends: - pkgMarkPkgUsed (Cache, D.TargetPkg(), pkgCache::State::RemoveRecommended); - break; - case pkgCache::Dep::Suggests: - pkgMarkPkgUsed (Cache, D.TargetPkg(), pkgCache::State::RemoveSuggested); - break; - case pkgCache::Dep::Conflicts: - case pkgCache::Dep::Replaces: - case pkgCache::Dep::Obsoletes: - // We don't handle these here - break; + if(Cache[p].Keep() && !p.CurrentVer().end()) + pkgMarkPackage(Cache, p, p.CurrentVer(), + follow_recommends, follow_suggests); + else if(Cache[p].Install()) + pkgMarkPackage(Cache, p, Cache[p].InstVerIter(Cache), + follow_recommends, follow_suggests); } } -// fprintf(stdout,"We keep %s %d %d \n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); -} - /*}}}*/ -bool pkgMarkUsed(pkgDepCache &Cache) -{ - // debug only - if(_config->FindI("Debug::pkgAutoRemove",false) == true) - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) - if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0) - std::clog << "has auto-remove information: " << Pkg.Name() - << " " << (int)Cache[Pkg].AutomaticRemove - << std::endl; - - // init with defaults - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) - Cache.SetDirty(Pkg, pkgCache::State::RemoveUnknown); - - // go recursive over the cache - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg) - pkgMarkPkgUsed (Cache, Pkg, pkgCache::State::RemoveManual); - + // do the sweep + for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) + { + pkgDepCache::StateCache &state=Cache[p]; + + if(!state.Marked) + { + // mark installed but not yet marked stuff as garbage + if(p->CurrentVer != 0) { + state.Garbage=true; + std::cout << "Garbage: " << p.Name() << std::endl; + } + +#if 0 // mvo: the below bits still needs to be ported + + // Be sure not to re-delete already deleted packages. + if(delete_unused && (!p.CurrentVer().end() || state.Install()) && + !state.Delete()) + { + bool do_delete=true; + + // If the package is being upgraded, check if we're + // losing a versioned dep. If the dependency matches + // the previous version and not the new version, keep + // the package back instead of removing it. + if(!p.CurrentVer().end() && state.Install()) + { + const char *vs=p.CurrentVer().VerStr(); + + // Check direct revdeps only. THIS ASSUMES NO + // VERSIONED PROVIDES, but Debian probably won't + // have them for ages if ever. + for(pkgCache::DepIterator revdep=p.RevDependsList(); + !revdep.end(); ++revdep) + { + pkgCache::PkgIterator depender=revdep.ParentPkg(); + // Find which version of the depending package + // will be installed. + pkgCache::VerIterator instver=(*this)[depender].InstVerIter(*this); + + // Only pay attention to strong positive + // dependencies whose parents will be installed. + if(revdep.ParentVer()==instver && + (revdep->Type==pkgCache::Dep::Depends || + revdep->Type==pkgCache::Dep::PreDepends || + (revdep->Type==pkgCache::Dep::Recommends && + follow_recommends))) + { + // If the previous version matched, cancel the + // deletion. (note that I assume that the new + // version does NOT match; otherwise it would + // not be unused!) + if(_system->VS->CheckDep(vs, + revdep->CompareOp, + revdep.TargetVer())) + { + mark_keep(p, false, false, undo); + do_delete=false; + break; + } + } + } + } + + if(do_delete) + mark_delete(p, false, true, undo); + } +#endif + } + } return true; } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index e30baa4b2..52b43d83d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -78,9 +78,7 @@ bool pkgDepCache::Init(OpProgress *Prog) // Find the proper cache slot StateCache &State = PkgState[I->ID]; State.iFlags = 0; - State.DirtyState = pkgCache::State::RemoveUnknown; - //State.AutomaticRemove = I->AutomaticRemove; - State.AutomaticRemove = pkgCache::State::RemoveUnknown; + State.InstallReason = Manual; // Figure out the install version State.CandidateVer = GetCandidateVer(I); @@ -116,7 +114,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) state_file.Open(state, FileFd::ReadOnly); int file_size = state_file.Size(); Prog->OverallProgress(0, file_size, 1, - _("Reading extended state information")); + _("Reading state information")); pkgTagFile tagfile(&state_file); pkgTagSection section; @@ -127,16 +125,17 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) // Silently ignore unknown packages and packages with no actual // version. if(!pkg.end() && !pkg.VersionList().end()) { - short reason = section.FindI("Remove-Reason", - pkgCache::State::RemoveManual); - PkgState[pkg->ID].AutomaticRemove = reason; - //std::cout << "Set: " << pkgname << " to " << reason << std::endl; + short reason = section.FindI("Install-Reason",pkgDepCache::Manual); + PkgState[pkg->ID].InstallReason = (ChangedReason)reason; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Install-Reason for: " << pkgname + << " is " << reason << std::endl; amt+=section.size(); Prog->OverallProgress(amt, file_size, 1, - _("Reading extended state information")); + _("Reading state information")); } Prog->OverallProgress(file_size, file_size, 1, - _("Reading extended state information")); + _("Reading state information")); } } @@ -145,9 +144,6 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) bool pkgDepCache::writeStateFile(OpProgress *prog) { - // FIXME: this function needs to be called inside the commit() - // of the package manager. so after - FileFd StateFile; string state = _config->FindDir("Dir::State") + "pkgstates"; @@ -160,20 +156,20 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) // clear out no longer installed pkg if(PkgState[pkg->ID].Delete() || pkg.CurrentVer() == NULL) - PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveUnknown; + PkgState[pkg->ID].InstallReason = Manual; // check if we have new information if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) { if(_config->FindI("Debug::pkgAutoRemove",false)) std::clog << "pkg: " << pkg.Name() << " is auto-dep" << std::endl; - PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveRequired; + PkgState[pkg->ID].InstallReason = Libapt; } - if(PkgState[pkg->ID].AutomaticRemove != pkgCache::State::RemoveUnknown) { + if(PkgState[pkg->ID].InstallReason != Manual) { ostr.str(string("")); - ostr << "Package: " << pkg.Name() - << "\nRemove-Reason: " - << (int)(PkgState[pkg->ID].AutomaticRemove) << "\n\n"; + ostr << "Package: " << pkg.Name() + << "\nInstall-Reason: " + << (int)(PkgState[pkg->ID].InstallReason) << "\n\n"; StateFile.Write(ostr.str().c_str(), ostr.str().size()); } } @@ -841,15 +837,6 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) AddSizes(Pkg); } /*}}}*/ -// DepCache::SetDirty - Switch the package between dirty states /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void pkgDepCache::SetDirty(PkgIterator const &Pkg, pkgCache::State::PkgRemoveState To) -{ - StateCache &P = PkgState[Pkg->ID]; - P.DirtyState = To; -} - /*}}}*/ // DepCache::SetCandidateVersion - Change the candidate version /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index e02ed72f0..c91e09ab3 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -63,6 +63,10 @@ class pkgDepCache : protected pkgCache::Namespace enum VersionTypes {NowVersion, InstallVersion, CandidateVersion}; enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2}; + + // Flags for the GC + enum ChangedReason {Manual, UserAuto, Libapt, FromResolver, PkgIsUnused}; + struct StateCache { // Epoch stripped text versions of the two version fields @@ -79,9 +83,13 @@ class pkgDepCache : protected pkgCache::Namespace unsigned short Flags; unsigned short iFlags; // Internal flags - // Traversal status and state for automatic removal - unsigned char DirtyState; - unsigned char AutomaticRemove; + // mark and sweep flags + ChangedReason InstallReason; +#if 0 + ChangedReason RemoveReason; +#endif + bool Marked; + bool Garbage; // Various tree indicators signed char Status; // -1,0,1,2 @@ -103,7 +111,6 @@ class pkgDepCache : protected pkgCache::Namespace inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;}; inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; inline bool Install() const {return Mode == ModeInstall;}; - inline unsigned char Dirty() const {return DirtyState;}; inline VerIterator InstVerIter(pkgCache &Cache) {return VerIterator(Cache,InstallVer);}; inline VerIterator CandidateVerIter(pkgCache &Cache) @@ -194,7 +201,6 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long Depth = 0); void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); - void SetDirty(PkgIterator const &Pkg, pkgCache::State::PkgRemoveState To); // This is for debuging void Update(OpProgress *Prog = 0); diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 083f20ac2..b07951dfb 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -75,7 +75,6 @@ class pkgCache enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2, HalfInstalled=4,ConfigFiles=5,Installed=6}; - enum PkgRemoveState {RemoveUnknown=0, RemoveManual=1,RemoveSuggested=2,RemoveRecommended=3,RemoveRequired=4}; }; struct Flag diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0236d7e77..9d97f8756 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1374,12 +1374,11 @@ bool DoAutomaticRemove(CacheFile &Cache) // look over the cache to see what can be removed for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) { - if (! Cache[Pkg].Dirty() && + if (Cache[Pkg].Garbage && (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && Cache[Pkg].Delete() == false)) { - fprintf(stdout,"We could delete %s %d\n", - Pkg.Name(), Cache[Pkg].AutomaticRemove); + fprintf(stdout,"We could delete %s\n", Pkg.Name()); Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); } } diff --git a/debian/changelog b/debian/changelog index 78559fd56..11e1a6282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,11 @@ apt (0.6.38ubuntu1mvo1) unstable; urgency=low the patch, thanks to Colin Watson for testing it. - better report network timeouts from the methods to the acuire code, only timeout once per sources.list line - - -- Michael Vogt Tue, 28 Jun 2005 11:18:24 +0200 + - started to port the great automatic dependency mangement code from + aptitude over to apt (thanks dburrows for answering my silly + questions and your great help!) + + -- apt (0.6.38ubuntu1) breezy; urgency=low -- cgit v1.2.3-70-g09d2 From bc80031f74e4acfca5b8ca7188b12ee885a713bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jun 2005 11:43:32 +0000 Subject: * fix a bug when readStateFile is called with no OpProgress object --- apt-pkg/depcache.cc | 15 +++++++++------ configure.in | 2 +- debian/changelog | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 05512e179..366687382 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -112,8 +112,9 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) if(FileExists(state)) { state_file.Open(state, FileFd::ReadOnly); int file_size = state_file.Size(); - Prog->OverallProgress(0, file_size, 1, - _("Reading state information")); + if(Prog != NULL) + Prog->OverallProgress(0, file_size, 1, + _("Reading state information")); pkgTagFile tagfile(&state_file); pkgTagSection section; @@ -131,11 +132,13 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) std::cout << "Install-Reason for: " << pkgname << " is " << reason << std::endl; amt+=section.size(); - Prog->OverallProgress(amt, file_size, 1, - _("Reading state information")); + if(Prog != NULL) + Prog->OverallProgress(amt, file_size, 1, + _("Reading state information")); } - Prog->OverallProgress(file_size, file_size, 1, - _("Reading state information")); + if(Prog != NULL) + Prog->OverallProgress(file_size, file_size, 1, + _("Reading state information")); } } diff --git a/configure.in b/configure.in index f78ce1d1e..2cbbd4b55 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.38ubuntu1mvo1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu1mvo1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 86dca75bc..a18f18f1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ apt (0.6.39ubuntu1mvo1) unstable; urgency=low only timeout once per sources.list line - support for automatic removal of unused dependencies added - -- + -- Michael Vogt Wed, 29 Jun 2005 13:01:36 +0200 apt (0.6.39) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From fc5aece9d8600b68cf8d654b379b6d840f2a5524 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jun 2005 10:50:08 +0000 Subject: * Install-Reason -> Auto-Installed in pkgstates --- apt-pkg/depcache.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 366687382..81c79d812 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -125,12 +125,11 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) // Silently ignore unknown packages and packages with no actual // version. if(!pkg.end() && !pkg.VersionList().end()) { - short reason = section.FindI("Install-Reason", 0); + short reason = section.FindI("Auto-Installed", 0); if(reason > 0) PkgState[pkg->ID].Flags |= pkgCache::Flag::Auto; if(_config->FindB("Debug::pkgAutoRemove",false)) - std::cout << "Install-Reason for: " << pkgname - << " is " << reason << std::endl; + std::cout << "Auto-Installed : " << pkgname << std::endl; amt+=section.size(); if(Prog != NULL) Prog->OverallProgress(amt, file_size, 1, @@ -165,7 +164,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) std::clog << "AutoInstal: " << pkg.Name() << std::endl; ostr.str(string("")); ostr << "Package: " << pkg.Name() - << "\nInstall-Reason: 1\n\n"; + << "\nAuto-Installed: 1\n\n"; StateFile.Write(ostr.str().c_str(), ostr.str().size()); } } -- cgit v1.2.3-70-g09d2 From f8ac1720a94468d1384e88a57729e6d9801b56fd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jun 2005 13:34:32 +0000 Subject: * slighly more debug output, renamed "--automatic-remove" to "--auto-remove" --- apt-pkg/algorithms.cc | 16 ++++++++++------ apt-pkg/depcache.cc | 4 ++-- cmdline/apt-get.cc | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 8626d33dc..3978e7561 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1353,6 +1353,11 @@ bool pkgMarkUsed(pkgDepCache &Cache, InRootSetFunc func) { Cache[p].Marked=false; Cache[p].Garbage=false; + + // debug output + if(_config->FindB("Debug::pkgAutoRemove",false) + && Cache[p].Flags & pkgCache::Flag::Auto) + std::clog << "AutoDep: " << p.Name() << std::endl; } // init vars @@ -1412,14 +1417,13 @@ bool pkgMarkUsed(pkgDepCache &Cache, InRootSetFunc func) { pkgDepCache::StateCache &state=Cache[p]; - if(!state.Marked) + // if it is not marked and it is installed, it's garbage + if(!state.Marked && !p.CurrentVer().end()) { - // mark installed but not yet marked stuff as garbage - if(p->CurrentVer != 0) { - state.Garbage=true; + state.Garbage=true; + if(_config->FindB("Debug::pkgAutoRemove",false)) std::cout << "Garbage: " << p.Name() << std::endl; - } - + #if 0 // mvo: the below bits still needs to be ported // Be sure not to re-delete already deleted packages. diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 81c79d812..9adc4e390 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -127,7 +127,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) if(!pkg.end() && !pkg.VersionList().end()) { short reason = section.FindI("Auto-Installed", 0); if(reason > 0) - PkgState[pkg->ID].Flags |= pkgCache::Flag::Auto; + PkgState[pkg->ID].Flags |= Flag::Auto; if(_config->FindB("Debug::pkgAutoRemove",false)) std::cout << "Auto-Installed : " << pkgname << std::endl; amt+=section.size(); @@ -159,7 +159,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) { - if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) { + if(PkgState[pkg->ID].Flags & Flag::Auto) { if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "AutoInstal: " << pkg.Name() << std::endl; ostr.str(string("")); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9d97f8756..cb8fc7724 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2522,7 +2522,7 @@ int main(int argc,const char *argv[]) {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, - {0,"automatic-remove","APT::Get::AutomaticRemove",0}, + {0,"auto-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, -- cgit v1.2.3-70-g09d2 From 45f7495cf1b62d402616caffacd9f343ca71c44d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 4 Jul 2005 16:38:42 +0000 Subject: * invert the auto-mark flag only for new installs (in MarkInstall()), keep it as it is for upgrades --- apt-pkg/depcache.cc | 4 +++- configure.in | 2 +- debian/changelog | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 9adc4e390..4c52c6c71 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -708,7 +708,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.Mode = ModeInstall; P.InstallVer = P.CandidateVer; - P.Flags &= ~Flag::Auto; + // invert the auto-flag only for new installs, not for upgrades + if(P.Status == 0) + P.Flags &= ~Flag::Auto; if (P.CandidateVer == (Version *)Pkg.CurrentVer()) P.Mode = ModeKeep; diff --git a/configure.in b/configure.in index 2cbbd4b55..39dc6a988 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu1mvo1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu4mvo1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index a18f18f1a..a11b4ab31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.39ubuntu1mvo1) unstable; urgency=low +apt (0.6.39ubuntu4mvo1) unstable; urgency=low * Michael Vogt - Change debian/bugscript to use #!/bin/bash (Closes: #313402) -- cgit v1.2.3-70-g09d2 From 74a05226eff7041cd8f2380fe599862d350a1ac3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 11:39:27 +0000 Subject: * merged daniel burrows fixes for the auto-mark code Patches applied: * dburrows@debian.org--2005/apt--auto-mark--0--base-0 tag of michael.vogt@ubuntu.com--2005/apt--auto-mark--0--patch-22 * dburrows@debian.org--2005/apt--auto-mark--0--patch-1 doxygenize the new automark stuff * dburrows@debian.org--2005/apt--auto-mark--0--patch-2 Automatically update package markings after every state-changing public operation, and allow users of the dep-cache to group actions into a single action. * dburrows@debian.org--2005/apt--auto-mark--0--patch-3 Automatically update package markings after every state-changing public operation, and allow users of the dep-cache to group actions into a single action. * dburrows@debian.org--2005/apt--auto-mark--0--patch-4 Make action groups noncopyable * dburrows@debian.org--2005/apt--auto-mark--0--patch-5 Typo fix * dburrows@debian.org--2005/apt--auto-mark--0--patch-6 Add a FromUser flag to MarkKeep. * dburrows@debian.org--2005/apt--auto-mark--0--patch-7 Somehow the ActionGroup definition got duplicated; kill the duplicate. * dburrows@debian.org--2005/apt--auto-mark--0--patch-8 Cancel the automatic flag on packages that are being kept only if they are garbage. * dburrows@debian.org--2005/apt--auto-mark--0--patch-9 Don't clear the 'automatically installed' flag in MarkDelete. * dburrows@debian.org--2005/apt--auto-mark--0--patch-10 Add a FromUser flag to MarkInstall, and fix its handling of the Auto flag. * dburrows@debian.org--2005/apt--auto-mark--0--patch-11 Only clear the Auto flag on manual changes in MarkKeep. * dburrows@debian.org--2005/apt--auto-mark--0--patch-12 Make changes from the internal algorithms automatic. * dburrows@debian.org--2005/apt--auto-mark--0--patch-13 Use ActionGroups in algorithms that make lots of changes, and fix a compile error. * dburrows@debian.org--2005/apt--auto-mark--0--patch-14 Split the sweep code into a separate routine from pkgMarkUsed * dburrows@debian.org--2005/apt--auto-mark--0--patch-15 Update another call of MarkKeep to indicate that it's automatic. * dburrows@debian.org--2005/apt--auto-mark--0--patch-16 Move the mark-and-sweep code into pkgDepCache; call Sweep and document what it and Garbage are for; add a hook that can be used to generate a custom root-set function; move the big blob of regexp stuff into the custom root-set; fix the memory leak in the regexp stuff. * dburrows@debian.org--2005/apt--auto-mark--0--patch-17 Make ActionGroup take a reference instead of a pointer to the cache. * dburrows@debian.org--2005/apt--auto-mark--0--patch-18 Don't mark already-to-be-deleted packages as garbage, to imitate aptitude's behavior. * dburrows@debian.org--2005/apt--auto-mark--0--patch-19 Update apt-get for the new auto-mark protocol. * dburrows@debian.org--2005/apt--auto-mark--0--patch-20 Add a setter method for the Auto flag. * dburrows@debian.org--2005/apt--auto-mark--0--patch-21 Fix the test in apt-get about what to delete. * dburrows@debian.org--2005/apt--auto-mark--0--patch-22 Add a zero-argument mark-and-sweep routine and use it to do a mark-and-sweep on startup (so the garbage flags are initialized properly). * dburrows@debian.org--2005/apt--auto-mark--0--patch-23 Right, Status is 2 for new installs, not 0. * dburrows@debian.org--2005/apt--auto-mark--0--patch-24 POT updates. * dburrows@debian.org--2005/apt--auto-mark--0--patch-25 Actually initialize group_level to 0. * dburrows@debian.org--2005/apt--auto-mark--0--patch-26 Don't make an ActionGroup in Sweep, since there's no point and it also is an infinite loop. * dburrows@debian.org--2005/apt--auto-mark--0--patch-27 Add virtual hooks to control whether the garbage collector considers recommends and/or suggests to be strong links. * dburrows@debian.org--2005/apt--auto-mark--0--patch-28 Call the progress methods in the right order so we don't generate nonsensical progress notifications. * dburrows@debian.org--2005/apt--auto-mark--0--patch-29 Typo fix. * dburrows@debian.org--2005/apt--auto-mark--0--patch-30 Make RecommendsImportant default to true in apt, too. * dburrows@debian.org--2005/apt--auto-mark--0--patch-31 Add a release() method to action groups. * dburrows@debian.org--2005/apt--auto-mark--0--patch-32 Add an 'autoremove' command that is synonymous to '--auto-remove remove'. --- apt-pkg/algorithms.cc | 318 ++++--------------------- apt-pkg/algorithms.h | 23 -- apt-pkg/depcache.cc | 322 ++++++++++++++++++++++++-- apt-pkg/depcache.h | 212 ++++++++++++++++- apt-pkg/packagemanager.cc | 2 +- cmdline/apt-get.cc | 35 ++- po/apt-all.pot | 576 ++++++++++++++++++++++++++++------------------ 7 files changed, 931 insertions(+), 557 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 82ea19c93..ac9d3be0b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -20,14 +20,12 @@ #include #include #include -#include #include #include #include #include -#include #include /*}}}*/ using namespace std; @@ -224,6 +222,8 @@ void pkgSimulate::ShortBreaks() the necessary calculations to deal with the problems. */ bool pkgApplyStatus(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (I->VersionList == 0) @@ -234,13 +234,13 @@ bool pkgApplyStatus(pkgDepCache &Cache) I->InstState == pkgCache::State::HoldReInstReq) { if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { // Is this right? Will dpkg choke on an upgrade? if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, false, 0, false); else return _error->Error(_("The package %s needs to be reinstalled, " "but I can't find an archive for it."),I.Name()); @@ -257,12 +257,12 @@ bool pkgApplyStatus(pkgDepCache &Cache) case pkgCache::State::HalfConfigured: if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) || I.State() != pkgCache::PkgIterator::NeedsUnpack) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, true, 0, false); else Cache.MarkDelete(I); } @@ -288,10 +288,12 @@ bool pkgApplyStatus(pkgDepCache &Cache) on the result. */ bool pkgFixBroken(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + // Auto upgrade all broken packages for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (Cache[I].NowBroken() == true) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Fix packages that are in a NeedArchive state but don't have a downloadable install version */ @@ -304,7 +306,7 @@ bool pkgFixBroken(pkgDepCache &Cache) if (Cache[I].InstVerIter(Cache).Downloadable() == false) continue; - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); } pkgProblemResolver Fix(&Cache); @@ -321,23 +323,25 @@ bool pkgFixBroken(pkgDepCache &Cache) */ bool pkgDistUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + /* Auto upgrade all installed packages, this provides the basis for the installation */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Now, auto upgrade all essential packages - this ensures that the essential packages are present and working */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* We do it again over all previously installed packages to force conflict resolution on them all. */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); pkgProblemResolver Fix(&Cache); @@ -349,7 +353,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache) if (I->SelectedState == pkgCache::State::Hold) { Fix.Protect(I); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } } } @@ -364,6 +368,8 @@ bool pkgDistUpgrade(pkgDepCache &Cache) to install packages not marked for install */ bool pkgAllUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + pkgProblemResolver Fix(&Cache); if (Cache.BrokenCount() != 0) @@ -380,7 +386,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache) continue; if (I->CurrentVer != 0 && Cache[I].InstallVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); } return Fix.ResolveByKeep(); @@ -393,6 +399,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache) the package is restored. */ bool pkgMinimizeUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + if (Cache.BrokenCount() != 0) return false; @@ -409,9 +417,9 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) continue; // Keep it and see if that is OK - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache.BrokenCount() != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); else { // If keep didnt actually do anything then there was no change.. @@ -569,6 +577,8 @@ void pkgProblemResolver::MakeScores() installable */ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) { + pkgDepCache::ActionGroup group(Cache); + if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false) return false; if ((Flags[Pkg->ID] & Protected) == Protected) @@ -577,7 +587,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) Flags[Pkg->ID] &= ~Upgradable; bool WasKept = Cache[Pkg].Keep(); - Cache.MarkInstall(Pkg,false); + Cache.MarkInstall(Pkg, false, 0, false); // This must be a virtual package or something like that. if (Cache[Pkg].InstVerIter(Cache).end() == true) @@ -662,7 +672,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) if (Fail == true) { if (WasKept == true) - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); else Cache.MarkDelete(Pkg); return false; @@ -689,6 +699,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) upgrade packages to advoid problems. */ bool pkgProblemResolver::Resolve(bool BrokenFix) { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; // Record which packages are marked for install @@ -704,7 +716,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Cache[I].InstBroken() == true && BrokenFix == true) { - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].Install() == true) Again = true; } @@ -770,14 +782,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::Version *OldVer = Cache[I].InstallVer; Flags[I->ID] &= ReInstateTried; - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].InstBroken() == true || OldBreaks < Cache.BrokenCount()) { if (OldVer == 0) Cache.MarkDelete(I); else - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } else if (Debug == true) @@ -822,7 +834,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Or group keep for " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); Change = true; } } @@ -872,7 +884,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } Change = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); break; } @@ -909,7 +921,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) /* See if a keep will do, unless the package is protected, then installing it will be necessary */ bool Installed = Cache[I].Install(); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { // Unwind operation will be keep now @@ -918,7 +930,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; @@ -990,7 +1002,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl; @@ -1035,7 +1047,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl; - Cache.MarkKeep(J->Pkg); + Cache.MarkKeep(J->Pkg, false, false); } if (Counter > 1) @@ -1089,6 +1101,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeep() { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; if (Debug == true) @@ -1122,7 +1136,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << "Keeping package " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { K = PList - 1; @@ -1170,7 +1184,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl; - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); } if (Cache[I].InstBroken() == false) @@ -1207,6 +1221,8 @@ bool pkgProblemResolver::ResolveByKeep() /* This is used to make sure protected packages are installed */ void pkgProblemResolver::InstallProtect() { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if ((Flags[I->ID] & Protected) == Protected) @@ -1214,7 +1230,7 @@ void pkgProblemResolver::InstallProtect() if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); else - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); } } } @@ -1251,247 +1267,3 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) } /*}}}*/ - -// mark a single package in Mark-and-Sweep -void pkgMarkPackage(pkgDepCache &Cache, - const pkgCache::PkgIterator &pkg, - const pkgCache::VerIterator &ver, - bool follow_recommends, - bool follow_suggests) -{ - pkgDepCache::StateCache &state=Cache[pkg]; - pkgCache::VerIterator candver=state.CandidateVerIter(Cache); - pkgCache::VerIterator instver=state.InstVerIter(Cache); - -#if 0 - // If a package was garbage-collected but is now being marked, we - // should re-select it - // For cases when a pkg is set to upgrade and this trigger the - // removal of a no-longer used dependency. if the pkg is set to - // keep again later it will result in broken deps - if(state.Delete() && state.RemoveReason=pkgDepCache::Unused) - { - if(ver==candver) - mark_install(pkg, false, false, NULL); - else if(ver==pkg.CurrentVer()) - MarkKeep(pkg); - - instver=state.InstVerIter(*this); - } -#endif - - // Ignore versions other than the InstVer, and ignore packages - // that are already going to be removed or just left uninstalled. - if(!(ver==instver && !instver.end())) - return; - - // if we are marked already we are done - if(state.Marked) - return; - - //std::cout << "Setting Marked for: " << pkg.Name() << std::endl; - state.Marked=true; - - if(!ver.end()) - { - for(pkgCache::DepIterator d=ver.DependsList(); !d.end(); ++d) - { - if(d->Type==pkgCache::Dep::Depends || - d->Type==pkgCache::Dep::PreDepends || - (follow_recommends && - d->Type==pkgCache::Dep::Recommends) || - (follow_suggests && - d->Type==pkgCache::Dep::Suggests)) - { - // Try all versions of this package. - for(pkgCache::VerIterator V=d.TargetPkg().VersionList(); - !V.end(); ++V) - { - if(_system->VS->CheckDep(V.VerStr(),d->CompareOp, d.TargetVer())) - { - pkgMarkPackage(Cache, V.ParentPkg(), V, - follow_recommends, follow_suggests); - } - } - // Now try virtual packages - for(pkgCache::PrvIterator prv=d.TargetPkg().ProvidesList(); - !prv.end(); ++prv) - { - if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, - d.TargetVer())) - { - pkgMarkPackage(Cache, prv.OwnerPkg(), prv.OwnerVer(), - follow_recommends, follow_suggests); - } - } - } - } - } -} - - -// Helper for APT::NeverAutoRemove, always include the packages matching -// this regexp into the root-set -inline bool -pkgMarkAlwaysInclude(pkgCache::PkgIterator p, vector alwaysMark) -{ - for(unsigned int i=0;iFindB("Debug::pkgAutoRemove",false) - && Cache[p].Flags & pkgCache::Flag::Auto) - std::clog << "AutoDep: " << p.Name() << std::endl; - } - - // init vars - follow_recommends=_config->FindB("APT::AutoRemove::RecommendsImportant",false); - follow_suggests=_config->FindB("APT::AutoRemove::SuggestsImportant", false); - - - // init the "NeverAutoRemove" variable - vector neverAutoRemoveRegexp; - Configuration::Item const *Opts; - Opts = _config->Tree("APT::NeverAutoRemove"); - if (Opts != 0 && Opts->Child != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - - regex_t *p = new regex_t; - if(regcomp(p,Opts->Value.c_str(), - REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) - { - regfree(p); - for(unsigned int i=0;iError("Regex compilation error for APT::NeverAutoRemove"); - } - neverAutoRemoveRegexp.push_back(p); - } - } - - - // do the mark part, this is the core bit of the algorithm - for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) - { - if( userFunc.InRootSet(p) || - pkgMarkAlwaysInclude(p, neverAutoRemoveRegexp) || - !(Cache[p].Flags & pkgCache::Flag::Auto) || - (p->Flags & pkgCache::Flag::Essential)) - - { - // the package is installed (and set to keep) - if(Cache[p].Keep() && !p.CurrentVer().end()) - pkgMarkPackage(Cache, p, p.CurrentVer(), - follow_recommends, follow_suggests); - // the package is to be installed - else if(Cache[p].Install()) - pkgMarkPackage(Cache, p, Cache[p].InstVerIter(Cache), - follow_recommends, follow_suggests); - } - } - - - // do the sweep - for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) - { - pkgDepCache::StateCache &state=Cache[p]; - - // if it is not marked and it is installed, it's garbage - if(!state.Marked && !p.CurrentVer().end()) - { - state.Garbage=true; - if(_config->FindB("Debug::pkgAutoRemove",false)) - std::cout << "Garbage: " << p.Name() << std::endl; - -#if 0 // mvo: the below bits still needs to be ported - - // Be sure not to re-delete already deleted packages. - if(delete_unused && (!p.CurrentVer().end() || state.Install()) && - !state.Delete()) - { - bool do_delete=true; - - // If the package is being upgraded, check if we're - // losing a versioned dep. If the dependency matches - // the previous version and not the new version, keep - // the package back instead of removing it. - if(!p.CurrentVer().end() && state.Install()) - { - const char *vs=p.CurrentVer().VerStr(); - - // Check direct revdeps only. THIS ASSUMES NO - // VERSIONED PROVIDES, but Debian probably won't - // have them for ages if ever. - for(pkgCache::DepIterator revdep=p.RevDependsList(); - !revdep.end(); ++revdep) - { - pkgCache::PkgIterator depender=revdep.ParentPkg(); - // Find which version of the depending package - // will be installed. - pkgCache::VerIterator instver=(*this)[depender].InstVerIter(*this); - - // Only pay attention to strong positive - // dependencies whose parents will be installed. - if(revdep.ParentVer()==instver && - (revdep->Type==pkgCache::Dep::Depends || - revdep->Type==pkgCache::Dep::PreDepends || - (revdep->Type==pkgCache::Dep::Recommends && - follow_recommends))) - { - // If the previous version matched, cancel the - // deletion. (note that I assume that the new - // version does NOT match; otherwise it would - // not be unused!) - if(_system->VS->CheckDep(vs, - revdep->CompareOp, - revdep.TargetVer())) - { - mark_keep(p, false, false, undo); - do_delete=false; - break; - } - } - } - } - - if(do_delete) - mark_delete(p, false, true, undo); - } -#endif - } - } - - // cleanup - for(unsigned int i=0;i #include +#include #include #include #include #include - /*}}}*/ + +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : + cache(cache), released(false) +{ + ++cache.group_level; +} + +void pkgDepCache::ActionGroup::release() +{ + if(!released) + { + if(cache.group_level == 0) + std::cerr << "W: Unbalanced action groups, expect badness" << std::endl; + else + { + --cache.group_level; + + if(cache.group_level == 0) + cache.MarkAndSweep(); + } + + released = false; + } +} + +pkgDepCache::ActionGroup::~ActionGroup() +{ + release(); +} // DepCache::pkgDepCache - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) : - Cache(pCache), PkgState(0), DepState(0) + group_level(0), Cache(pCache), PkgState(0), DepState(0) { delLocalPolicy = 0; LocalPolicy = Plcy; @@ -53,6 +82,10 @@ pkgDepCache::~pkgDepCache() /* This allocats the extension buffers and initializes them. */ bool pkgDepCache::Init(OpProgress *Prog) { + // Suppress mark updates during this operation (just in case) and + // run a mark operation when Init terminates. + ActionGroup actions(*this); + delete [] PkgState; delete [] DepState; PkgState = new StateCache[Head().PackageCount]; @@ -100,7 +133,7 @@ bool pkgDepCache::Init(OpProgress *Prog) if(Prog != 0) Prog->Done(); - + return true; } /*}}}*/ @@ -161,7 +194,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) if(PkgState[pkg->ID].Flags & Flag::Auto) { if(_config->FindB("Debug::pkgAutoRemove",false)) - std::clog << "AutoInstal: " << pkg.Name() << std::endl; + std::clog << "AutoInstall: " << pkg.Name() << std::endl; ostr.str(string("")); ostr << "Package: " << pkg.Name() << "\nAuto-Installed: 1\n\n"; @@ -522,16 +555,16 @@ void pkgDepCache::Update(OpProgress *Prog) AddStates(I); } - readStateFile(Prog); - if (Prog != 0) Prog->Progress(Done); + + readStateFile(Prog); } /*}}}*/ // DepCache::Update - Update the deps list of a package /*{{{*/ // --------------------------------------------------------------------- /* This is a helper for update that only does the dep portion of the scan. - It is mainly ment to scan reverse dependencies. */ + It is mainly meant to scan reverse dependencies. */ void pkgDepCache::Update(DepIterator D) { // Update the reverse deps @@ -583,7 +616,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg) // DepCache::MarkKeep - Put the package in the keep state /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) { // Simplifies other routines. if (Pkg.end() == true) @@ -595,6 +628,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) Pkg.CurrentVer().Downloadable() == false) return; + /** \todo Can this be moved later in the method? */ + ActionGroup group(*this); + /* We changed the soft state all the time so the UI is a bit nicer to use */ StateCache &P = PkgState[Pkg->ID]; @@ -611,7 +647,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) if (Pkg->VersionList == 0) return; - P.Flags &= ~Flag::Auto; + if(FromUser && !P.Marked) + P.Flags &= ~Flag::Auto; RemoveSizes(Pkg); RemoveStates(Pkg); @@ -637,6 +674,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) if (Pkg.end() == true) return; + ActionGroup group(*this); + // Check that it is not already marked for delete StateCache &P = PkgState[Pkg->ID]; P.iFlags &= ~(AutoKept | Purge); @@ -659,8 +698,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) else P.Mode = ModeDelete; P.InstallVer = 0; - // This was not inverted before, but I think it should be - P.Flags &= ~Flag::Auto; AddStates(Pkg); Update(Pkg); @@ -671,7 +708,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, - unsigned long Depth) + unsigned long Depth, bool FromUser) { if (Depth > 100) return; @@ -680,6 +717,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (Pkg.end() == true) return; + ActionGroup group(*this); + /* Check that it is not already marked for install and that it can be installed */ StateCache &P = PkgState[Pkg->ID]; @@ -688,7 +727,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) - MarkKeep(Pkg); + MarkKeep(Pkg, false, FromUser); return; } @@ -708,9 +747,20 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.Mode = ModeInstall; P.InstallVer = P.CandidateVer; - // invert the auto-flag only for new installs, not for upgrades - if(P.Status == 0) - P.Flags &= ~Flag::Auto; + + if(FromUser) + { + // Set it to manual if it's a new install or cancelling the + // removal of a garbage package. + if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked)) + P.Flags &= ~Flag::Auto; + } + else + { + // Set it to auto if this is a new install. + if(P.Status == 2) + P.Flags |= Flag::Auto; + } if (P.CandidateVer == (Version *)Pkg.CurrentVer()) P.Mode = ModeKeep; @@ -788,13 +838,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } if (InstPkg.end() == false) - { - MarkInstall(InstPkg,true,Depth + 1); - - // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) - PkgState[InstPkg->ID].Flags |= Flag::Auto; - } + MarkInstall(InstPkg, true, Depth + 1, false); continue; } @@ -809,7 +853,6 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgIterator Pkg = Ver.ParentPkg(); MarkDelete(Pkg); - PkgState[Pkg->ID].Flags |= Flag::Auto; } continue; } @@ -821,6 +864,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + ActionGroup group(*this); + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -839,9 +884,11 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) /* */ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) { + ActionGroup group(*this); + pkgCache::PkgIterator Pkg = TargetVer.ParentPkg(); StateCache &P = PkgState[Pkg->ID]; - + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -854,6 +901,18 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) Update(Pkg); AddSizes(Pkg); } + +void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto) +{ + StateCache &state = PkgState[Pkg->ID]; + + ActionGroup group(*this); + + if(Auto) + state.Flags |= Flag::Auto; + else + state.Flags &= ~Flag::Auto; +} /*}}}*/ // StateCache::Update - Compute the various static display things /*{{{*/ // --------------------------------------------------------------------- @@ -944,3 +1003,216 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) return Dep.IsCritical(); } /*}}}*/ + +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() + : constructedSuccessfully(false) +{ + Configuration::Item const *Opts; + Opts = _config->Tree("APT::NeverAutoRemove"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + + regex_t *p = new regex_t; + if(regcomp(p,Opts->Value.c_str(), + REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) + { + regfree(p); + delete p; + _error->Error("Regex compilation error for APT::NeverAutoRemove"); + return; + } + + rootSetRegexp.push_back(p); + } + } + + constructedSuccessfully = true; +} + +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() +{ + for(unsigned int i = 0; i < rootSetRegexp.size(); i++) + { + regfree(rootSetRegexp[i]); + delete rootSetRegexp[i]; + } +} + + +bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) +{ + for(unsigned int i = 0; i < rootSetRegexp.size(); i++) + if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0) + return true; + + return false; +} + +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() +{ + DefaultRootSetFunc *f = new DefaultRootSetFunc; + if(f->wasConstructedSuccessfully()) + return f; + else + { + delete f; + return NULL; + } +} + +bool pkgDepCache::MarkFollowsRecommends() +{ + return _config->FindB("APT::AutoRemove::RecommendsImportant", true); +} + +bool pkgDepCache::MarkFollowsSuggests() +{ + return _config->FindB("APT::AutoRemove::SuggestsImportant", false); +} + +// the main mark algorithm +bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) +{ + bool follow_recommends; + bool follow_suggests; + + // init the states + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + PkgState[p->ID].Marked = false; + PkgState[p->ID].Garbage = false; + + // debug output + if(_config->FindB("Debug::pkgAutoRemove",false) + && PkgState[p->ID].Flags & Flag::Auto) + std::clog << "AutoDep: " << p.Name() << std::endl; + } + + // init vars + follow_recommends = MarkFollowsRecommends(); + follow_suggests = MarkFollowsSuggests(); + + + + // do the mark part, this is the core bit of the algorithm + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + if(!(PkgState[p->ID].Flags & Flag::Auto) || + (p->Flags & Flag::Essential) || + userFunc.InRootSet(p)) + + { + // the package is installed (and set to keep) + if(PkgState[p->ID].Keep() && !p.CurrentVer().end()) + MarkPackage(p, p.CurrentVer(), + follow_recommends, follow_suggests); + // the package is to be installed + else if(PkgState[p->ID].Install()) + MarkPackage(p, PkgState[p->ID].InstVerIter(*this), + follow_recommends, follow_suggests); + } + } + + return true; +} + +// mark a single package in Mark-and-Sweep +void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests) +{ + pkgDepCache::StateCache &state = PkgState[pkg->ID]; + VerIterator candver = state.CandidateVerIter(*this); + VerIterator instver = state.InstVerIter(*this); + +#if 0 + // If a package was garbage-collected but is now being marked, we + // should re-select it + // For cases when a pkg is set to upgrade and this trigger the + // removal of a no-longer used dependency. if the pkg is set to + // keep again later it will result in broken deps + if(state.Delete() && state.RemoveReason = Unused) + { + if(ver==candver) + mark_install(pkg, false, false, NULL); + else if(ver==pkg.CurrentVer()) + MarkKeep(pkg, false, false); + + instver=state.InstVerIter(*this); + } +#endif + + // Ignore versions other than the InstVer, and ignore packages + // that are already going to be removed or just left uninstalled. + if(!(ver == instver && !instver.end())) + return; + + // if we are marked already we are done + if(state.Marked) + return; + + //std::cout << "Setting Marked for: " << pkg.Name() << std::endl; + state.Marked=true; + + if(!ver.end()) + { + for(DepIterator d = ver.DependsList(); !d.end(); ++d) + { + if(d->Type == Dep::Depends || + d->Type == Dep::PreDepends || + (follow_recommends && + d->Type == Dep::Recommends) || + (follow_suggests && + d->Type == Dep::Suggests)) + { + // Try all versions of this package. + for(VerIterator V = d.TargetPkg().VersionList(); + !V.end(); ++V) + { + if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer())) + { + MarkPackage(V.ParentPkg(), V, + follow_recommends, follow_suggests); + } + } + // Now try virtual packages + for(PrvIterator prv=d.TargetPkg().ProvidesList(); + !prv.end(); ++prv) + { + if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, + d.TargetVer())) + { + MarkPackage(prv.OwnerPkg(), prv.OwnerVer(), + follow_recommends, follow_suggests); + } + } + } + } + } +} + +bool pkgDepCache::Sweep() +{ + // do the sweep + for(PkgIterator p=PkgBegin(); !p.end(); ++p) + { + StateCache &state=PkgState[p->ID]; + + // if it is not marked and it is installed, it's garbage + if(!state.Marked && (!p.CurrentVer().end() || state.Install()) && + !state.Delete()) + { + state.Garbage=true; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Garbage: " << p.Name() << std::endl; + } + } + + return true; +} diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 619daf8f6..fd935c268 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +// -*- mode: c++; mode: fold -*- // Description /*{{{*/ // $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### @@ -45,9 +45,71 @@ #include #include +#include + +#include + class pkgDepCache : protected pkgCache::Namespace { public: + + /** \brief An arbitrary predicate on packages. */ + class InRootSetFunc + { + public: + virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;}; + virtual ~InRootSetFunc() {}; + }; + + private: + /** \brief Mark a single package and all its unmarked important + * dependencies during mark-and-sweep. + * + * Recursively invokes itself to mark all dependencies of the + * package. + * + * \param pkg The package to mark. + * + * \param ver The version of the package that is to be marked. + * + * \param follow_recommends If \b true, recommendations of the + * package will be recursively marked. + * + * \param follow_suggests If \b true, suggestions of the package + * will be recursively marked. + */ + void MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests); + + /** \brief Update the Marked field of all packages. + * + * Each package's StateCache::Marked field will be set to \b true + * if and only if it can be reached from the root set. By + * default, the root set consists of the set of manually installed + * or essential packages, but it can be extended using the + * parameter #rootFunc. + * + * \param rootFunc A callback that can be used to add extra + * packages to the root set. + * + * \return \b false if an error occured. + */ + bool MarkRequired(InRootSetFunc &rootFunc); + + /** \brief Set the StateCache::Garbage flag on all packages that + * should be removed. + * + * Packages that were not marked by the last call to #MarkRequired + * are tested to see whether they are actually garbage. If so, + * they are marked as such. + * + * \return \b false if an error occured. + */ + bool Sweep(); + + public: // These flags are used in DepState enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2), @@ -64,6 +126,83 @@ class pkgDepCache : protected pkgCache::Namespace enum VersionTypes {NowVersion, InstallVersion, CandidateVersion}; enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2}; + /** \brief Represents an active action group. + * + * An action group is a group of actions that are currently being + * performed. While an active group is active, certain routine + * clean-up actions that would normally be performed after every + * cache operation are delayed until the action group is + * completed. This is necessary primarily to avoid inefficiencies + * when modifying a large number of packages at once. + * + * This class represents an active action group. Creating an + * instance will create an action group; destroying one will + * destroy the corresponding action group. + * + * The following operations are suppressed by this class: + * + * - Keeping the Marked and Garbage flags up to date. + * + * \note This can be used in the future to easily accumulate + * atomic actions for undo or to display "what apt did anyway"; + * e.g., change the counter of how many action groups are active + * to a std::set of pointers to them and use those to store + * information about what happened in a group in the group. + */ + class ActionGroup + { + pkgDepCache &cache; + + bool released; + + /** Action groups are noncopyable. */ + ActionGroup(const ActionGroup &other); + public: + /** \brief Create a new ActionGroup. + * + * \param cache The cache that this ActionGroup should + * manipulate. + * + * As long as this object exists, no automatic cleanup + * operations will be undertaken. + */ + ActionGroup(pkgDepCache &cache); + + /** \brief Clean up the action group before it is destroyed. + * + * If it is destroyed later, no second cleanup wil be run. + */ + void release(); + + /** \brief Destroy the action group. + * + * If this is the last action group, the automatic cache + * cleanup operations will be undertaken. + */ + ~ActionGroup(); + }; + + /** \brief Returns \b true for packages matching a regular + * expression in APT::NeverAutoRemove. + */ + class DefaultRootSetFunc : public InRootSetFunc + { + std::vector rootSetRegexp; + bool constructedSuccessfully; + + public: + DefaultRootSetFunc(); + ~DefaultRootSetFunc(); + + /** \return \b true if the class initialized successfully, \b + * false otherwise. Used to avoid throwing an exception, since + * APT classes generally don't. + */ + bool wasConstructedSuccessfully() const { return constructedSuccessfully; } + + bool InRootSet(const pkgCache::PkgIterator &pkg); + }; + struct StateCache { // Epoch stripped text versions of the two version fields @@ -80,8 +219,15 @@ class pkgDepCache : protected pkgCache::Namespace unsigned short Flags; unsigned short iFlags; // Internal flags - // mark and sweep flags + /** \brief \b true if this package can be reached from the root set. */ bool Marked; + + /** \brief \b true if this package is unused and should be removed. + * + * This differs from !#Marked, because it is possible that some + * unreachable packages will be protected from becoming + * garbage. + */ bool Garbage; // Various tree indicators @@ -124,6 +270,14 @@ class pkgDepCache : protected pkgCache::Namespace virtual ~Policy() {}; }; + + private: + /** The number of open "action groups"; certain post-action + * operations are suppressed if this number is > 0. + */ + int group_level; + + friend class ActionGroup; protected: @@ -187,13 +341,61 @@ class pkgDepCache : protected pkgCache::Namespace inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];}; inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];}; - // Manipulators - void MarkKeep(PkgIterator const &Pkg,bool Soft = false); + /** \return A function identifying packages in the root set other + * than manually installed packages and essential packages, or \b + * NULL if an error occurs. + * + * \todo Is this the best place for this function? Perhaps the + * settings for mark-and-sweep should be stored in a single + * external class? + */ + virtual InRootSetFunc *GetRootSetFunc(); + + /** \return \b true if the garbage collector should follow recommendations. + */ + virtual bool MarkFollowsRecommends(); + + /** \return \b true if the garbage collector should follow suggestions. + */ + virtual bool MarkFollowsSuggests(); + + /** \brief Update the Marked and Garbage fields of all packages. + * + * This routine is implicitly invoked after all state manipulators + * and when an ActionGroup is destroyed. It invokes #MarkRequired + * and #Sweep to do its dirty work. + * + * \param rootFunc A predicate that returns \b true for packages + * that should be added to the root set. + */ + bool MarkAndSweep(InRootSetFunc &rootFunc) + { + return MarkRequired(rootFunc) && Sweep(); + } + + bool MarkAndSweep() + { + std::auto_ptr f(GetRootSetFunc()); + if(f.get() != NULL) + return MarkAndSweep(*f.get()); + else + return false; + } + + /** \name State Manipulators + */ + // @{ + void MarkKeep(PkgIterator const &Pkg, bool Soft = false, + bool FromUser = true); void MarkDelete(PkgIterator const &Pkg,bool Purge = false); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, - unsigned long Depth = 0); + unsigned long Depth = 0, bool FromUser = true); void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); + + /** Set the "is automatically installed" flag of Pkg. */ + void MarkAuto(const PkgIterator &Pkg, bool Auto); + // @} // This is for debuging void Update(OpProgress *Prog = 0); diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 87a21004f..05615db79 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -106,7 +106,7 @@ bool pkgPackageManager::FixMissing() // Okay, this file is missing and we need it. Mark it for keep Bad = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } // We have to empty the list otherwise it will not have the new changes diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ac0d56073..c8b64f5d8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1370,19 +1370,23 @@ bool DoAutomaticRemove(CacheFile &Cache) return _error->Error(_("We are not supposed to delete stuff, can't " "start AutoRemover")); - // do the actual work - pkgMarkUsed(Cache); - - // look over the cache to see what can be removed - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) { - if (Cache[Pkg].Garbage && - (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && - Cache[Pkg].Delete() == false)) - { - fprintf(stdout,"We could delete %s\n", Pkg.Name()); - Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); - } + pkgDepCache::ActionGroup group(*Cache); + + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + fprintf(stdout,"We could delete %s\n", Pkg.Name()); + + if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } } // Now see if we destroyed anything @@ -1399,6 +1403,7 @@ bool DoAutomaticRemove(CacheFile &Cache) } return true; } + // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@ -1450,6 +1455,11 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } for (const char **I = CmdL.FileList + 1; *I != 0; I++) { @@ -2533,6 +2543,7 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"autoremove",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --git a/po/apt-all.pot b/po/apt-all.pot index d06c14ce1..bca32b327 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-06 14:00+0200\n" +"POT-Creation-Date: 2005-11-02 18:56-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,8 +147,8 @@ msgid " %4i %s\n" msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2375 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -231,7 +231,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@ -240,31 +240,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 -#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 -#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:250 +#: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:367 +#: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:397 +#: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:551 +#: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -306,11 +306,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:757 +#: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:830 +#: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -343,83 +343,83 @@ msgstr "" msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:126 +#: ftparchive/writer.cc:125 msgid "E: " msgstr "" -#: ftparchive/writer.cc:128 +#: ftparchive/writer.cc:127 msgid "W: " msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:152 ftparchive/writer.cc:182 +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:164 +#: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:189 +#: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:246 +#: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:258 +#: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:275 +#: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/writer.cc:378 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:386 ftparchive/writer.cc:595 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:429 ftparchive/writer.cc:677 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@ -519,200 +519,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 +#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1532 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:345 msgid " or" msgstr "" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:659 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:692 +msgid "Authentication warning overridden.\n" +msgstr "" + +#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:754 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" + +#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 +#: cmdline/apt-get.cc:774 +msgid "Internal error, Ordering didn't finish" +msgstr "" + +#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1831 cmdline/apt-get.cc:1864 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1912 cmdline/apt-get.cc:2123 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:815 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" + +#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:826 +#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 +#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:1978 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "" + +#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:865 +#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -720,74 +741,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1337 cmdline/apt-get.cc:2021 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 +#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2030 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1026 +#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1054 +#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1065 +#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -795,79 +816,97 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1129 +#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1172 +#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1285 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1437 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1353 +#: cmdline/apt-get.cc:1356 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1370 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1395 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1398 cmdline/apt-get.cc:1600 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1402 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1420 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 +#: cmdline/apt-get.cc:1519 cmdline/apt-get.cc:1555 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1494 +#: cmdline/apt-get.cc:1542 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1524 +#: cmdline/apt-get.cc:1572 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1575 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1539 +#: cmdline/apt-get.cc:1587 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -875,149 +914,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1595 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1552 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1603 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1581 +#: cmdline/apt-get.cc:1634 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1652 +#: cmdline/apt-get.cc:1705 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1706 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1673 +#: cmdline/apt-get.cc:1726 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1729 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1734 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1799 cmdline/apt-get.cc:1807 +msgid "Internal error, problem resolver broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1907 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2141 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1928 +#: cmdline/apt-get.cc:1981 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1986 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1989 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1942 +#: cmdline/apt-get.cc:1995 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2026 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:2054 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2013 +#: cmdline/apt-get.cc:2066 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2083 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2049 +#: cmdline/apt-get.cc:2102 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2118 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2093 +#: cmdline/apt-get.cc:2146 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2113 +#: cmdline/apt-get.cc:2166 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2165 +#: cmdline/apt-get.cc:2218 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2270 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:2305 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2330 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2291 +#: cmdline/apt-get.cc:2344 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2295 +#: cmdline/apt-get.cc:2348 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2327 +#: cmdline/apt-get.cc:2380 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2368 +#: cmdline/apt-get.cc:2421 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1270,8 +1309,8 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1301,9 +1340,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 +#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 +#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@ -1431,11 +1470,12 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" @@ -1495,7 +1535,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1507,7 +1547,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1608,43 +1648,79 @@ msgstr "" msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:92 +#: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:104 +#: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:132 methods/rsh.cc:425 +#: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:163 +#: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:167 +#: methods/connect.cc:169 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:169 +#: methods/connect.cc:171 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:216 +#: methods/connect.cc:218 #, c-format msgid "Unable to connect to %s %s:" msgstr "" +#: methods/gpgv.cc:92 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" + +#: methods/gpgv.cc:191 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" + +#: methods/gpgv.cc:196 +msgid "At least one invalid signature was encountered." +msgstr "" + +#. FIXME String concatenation considered harmful. +#: methods/gpgv.cc:201 +msgid "Could not execute " +msgstr "" + +#: methods/gpgv.cc:202 +msgid " to verify signature (is gnupg installed?)" +msgstr "" + +#: methods/gpgv.cc:206 +msgid "Unknown error executing gpgv" +msgstr "" + +#: methods/gpgv.cc:237 +msgid "The following signatures were invalid:\n" +msgstr "" + +#: methods/gpgv.cc:244 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@ -1728,10 +1804,6 @@ msgstr "" msgid "Internal error" msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@ -1746,57 +1818,57 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:395 +#: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:453 +#: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:471 +#: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:567 +#: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:586 +#: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:603 +#: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:643 +#: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:650 +#: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:663 +#: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:697 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -1862,7 +1934,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -1871,70 +1943,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:80 +#: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:85 +#: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:103 +#: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:107 +#: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:359 +#: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:369 +#: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:372 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:374 +#: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:418 +#: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:504 +#: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:579 +#: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:585 +#: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:596 +#: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "" @@ -2007,18 +2079,27 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:89 apt-pkg/depcache.cc:118 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:90 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:119 msgid "Dependency generation" msgstr "" +#: apt-pkg/depcache.cc:140 apt-pkg/depcache.cc:159 apt-pkg/depcache.cc:163 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:179 +#, c-format +msgid "Failed to write StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@ -2092,32 +2173,37 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:61 +#: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:65 +#: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "" +#: apt-pkg/acquire.cc:817 +#, c-format +msgid "Downloading file %li of %li (%s remaining)" +msgstr "" + #: apt-pkg/acquire-worker.cc:112 #, c-format msgid "The method driver %s could not be found." @@ -2167,82 +2253,82 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@ -2251,31 +2337,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:906 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:714 +#: apt-pkg/acquire-item.cc:720 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:767 +#: apt-pkg/acquire-item.cc:773 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:803 +#: apt-pkg/acquire-item.cc:809 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:890 +#: apt-pkg/acquire-item.cc:896 msgid "Size mismatch" msgstr "" @@ -2373,3 +2459,57 @@ msgstr "" #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:358 +#, c-format +msgid "Preparing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:359 +#, c-format +msgid "Unpacking %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:364 +#, c-format +msgid "Preparing to configure %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:365 +#, c-format +msgid "Configuring %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:366 +#, c-format +msgid "Installed %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:371 +#, c-format +msgid "Preparing for removal of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:372 +#, c-format +msgid "Removing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:373 +#, c-format +msgid "Removed %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:378 +#, c-format +msgid "Preparing for remove with config %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:379 +#, c-format +msgid "Removed with config %s" +msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" -- cgit v1.2.3-70-g09d2 From 60681f9354217c830943315951e6559253bfa832 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 May 2006 09:44:30 +0200 Subject: * depcache.cc: - added APT::Install-{Recommends,Suggests} global option * depcache.h: - added DepCache::State::InstPolicyBroken() to check if the current install state violates the policy (compated with InstBroken() that only checks for the minimal requirements) --- apt-pkg/depcache.cc | 16 +++++++++++----- apt-pkg/depcache.h | 1 + cmdline/apt-get.cc | 6 ++++-- 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index dd1c794c9..589fc2f7d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -16,7 +16,7 @@ #include #include #include - +#include #include /*}}}*/ @@ -609,7 +609,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, installed */ StateCache &P = PkgState[Pkg->ID]; P.iFlags &= ~AutoKept; - if (P.InstBroken() == false && (P.Mode == ModeInstall || + if ((P.InstPolicyBroken() == false && P.InstBroken() == false) && + (P.Mode == ModeInstall || P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) @@ -620,11 +621,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, // See if there is even any possible instalation candidate if (P.CandidateVer == 0) return; - // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) return; - /* Target the candidate version and remove the autoflag. We reset the autoflag below if this was called recursively. Otherwise the user should have the ability to de-auto a package by changing its state */ @@ -864,6 +863,13 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) /* */ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) { - return Dep.IsCritical(); + if(Dep.IsCritical()) + return true; + else if(Dep->Type == pkgCache::Dep::Recommends) + return _config->FindB("APT::Install-Recommends", false); + else if(Dep->Type == pkgCache::Dep::Suggests) + return _config->FindB("APT::Install-Suggests", false); + + return false; } /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6d51920e9..3f9f67140 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -98,6 +98,7 @@ class pkgDepCache : protected pkgCache::Namespace inline bool Held() const {return Status != 0 && Keep();}; inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;}; inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; + inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;}; inline bool Install() const {return Mode == ModeInstall;}; inline VerIterator InstVerIter(pkgCache &Cache) {return VerIterator(Cache,InstallVer);}; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d4a6bee32..6979fa8f2 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1145,9 +1145,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, else ExpectedInst++; - // Install it with autoinstalling enabled. - if (State.InstBroken() == true && BrokenFix == false) + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); + return true; } /*}}}*/ -- cgit v1.2.3-70-g09d2 From aac2e51078714d5130861035e9b3b5d4d6b84471 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Jun 2006 06:33:22 +0200 Subject: * apt-pkg/depcache.cc: - renamed "pkgstates" file to "extended_states" --- apt-pkg/depcache.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6eb6c1d85..4e9488121 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -142,7 +142,7 @@ bool pkgDepCache::Init(OpProgress *Prog) bool pkgDepCache::readStateFile(OpProgress *Prog) { FileFd state_file; - string state = _config->FindDir("Dir::State") + "pkgstates"; + string state = _config->FindDir("Dir::State") + "extended_states"; if(FileExists(state)) { state_file.Open(state, FileFd::ReadOnly); int file_size = state_file.Size(); @@ -181,7 +181,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) bool pkgDepCache::writeStateFile(OpProgress *prog) { FileFd StateFile; - string state = _config->FindDir("Dir::State") + "pkgstates"; + string state = _config->FindDir("Dir::State") + "extended_states"; if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "pkgDepCache::writeStateFile()" << std::endl; -- cgit v1.2.3-70-g09d2 From b1a8717ae8e07101cfae03b978d57b793884a3d9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Jun 2006 09:17:05 +0200 Subject: * cmdline/apt-mark: - very simple tool to manipulate the extended_states for autoinstall * apt-pkg/depcache.cc: - keep exisiting data in "extended_states" to make other tools happy --- apt-pkg/depcache.cc | 62 ++++++++-- cmdline/apt-mark | 63 ++++++++++ po/apt-all.pot | 338 ++++++++++++++++++++++++++++------------------------ 3 files changed, 299 insertions(+), 164 deletions(-) create mode 100755 cmdline/apt-mark (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 4e9488121..7663d3881 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -24,6 +24,7 @@ #include #include +#include #include @@ -180,28 +181,71 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) bool pkgDepCache::writeStateFile(OpProgress *prog) { - FileFd StateFile; - string state = _config->FindDir("Dir::State") + "extended_states"; - if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "pkgDepCache::writeStateFile()" << std::endl; - if(!StateFile.Open(state, FileFd::WriteEmpty)) - return _error->Error(_("Failed to write StateFile %s"), + FileFd StateFile; + string state = _config->FindDir("Dir::State") + "extended_states"; + if(!StateFile.Open(state, FileFd::ReadOnly)) + return _error->Error(_("Failed to open StateFile %s"), state.c_str()); + FILE *OutFile; + string outfile = state + ".tmp"; + if((OutFile = fopen(outfile.c_str(),"w")) == NULL) + return _error->Error(_("Failed to write temporary StateFile %s"), + outfile.c_str()); + + // first merge with the existing sections + pkgTagFile tagfile(&StateFile); + pkgTagSection section; + std::set pkgs_seen; + const char *nullreorderlist[] = {0}; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + // Silently ignore unknown packages and packages with no actual + // version. + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + if(pkg.end() || pkg.VersionList().end()) + continue; + bool oldAuto = section.FindI("Auto-Installed"); + bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Update exisiting AutoInstall info: " + << pkg.Name() << std::endl; + TFRewriteData rewrite[2]; + rewrite[0].Tag = "Auto-Installed"; + rewrite[0].Rewrite = newAuto ? "1" : "0"; + rewrite[0].NewTag = 0; + rewrite[1].Tag = 0; + TFRewrite(OutFile, section, nullreorderlist, rewrite); + fprintf(OutFile,"\n"); + pkgs_seen.insert(pkgname); + } + + // then write the ones we have not seen yet std::ostringstream ostr; - for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) { - + for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { if(PkgState[pkg->ID].Flags & Flag::Auto) { + if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Skipping already written " << pkg.Name() << std::endl; + continue; + } if(_config->FindB("Debug::pkgAutoRemove",false)) - std::clog << "AutoInstall: " << pkg.Name() << std::endl; + std::clog << "Writing new AutoInstall: " + << pkg.Name() << std::endl; ostr.str(string("")); ostr << "Package: " << pkg.Name() << "\nAuto-Installed: 1\n\n"; - StateFile.Write(ostr.str().c_str(), ostr.str().size()); + fprintf(OutFile,ostr.str().c_str()); + fprintf(OutFile,"\n"); } } + + // move the outfile over the real file + rename(outfile.c_str(), state.c_str()); + return true; } diff --git a/cmdline/apt-mark b/cmdline/apt-mark new file mode 100755 index 000000000..533ed8715 --- /dev/null +++ b/cmdline/apt-mark @@ -0,0 +1,63 @@ +#!/usr/bin/python + +from optparse import OptionParser + +try: + import apt_pkg +except ImportError: + print "Error importing apt_pkg, is python-apt installed?" + +import sys +import os.path + +actions = { "markauto" : 1, + "unmarkauto": 0 + } + +if __name__ == "__main__": + apt_pkg.init() + + # option parsing + parser = OptionParser() + parser.usage = "%prog [options] {markauto|unmarkauto} packages..." + parser.add_option("-f", "--file", action="store", type="string", + dest="filename", + help="read/write a different file") + parser.add_option("-v", "--verbose", + action="store_true", dest="verbose", default=False, + help="print verbose status messages to stdout") + (options, args) = parser.parse_args() + if len(args) < 2: + parser.error("not enough argument") + + # get pkgs to change + if args[0] not in actions.keys(): + parser.error("first argument must be 'markauto' or 'unmarkauto'") + pkgs = args[1:] + action = actions[args[0]] + + # get the state-file + if not options.filename: + STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + else: + STATE_FILE=options.state_file + + # open the statefile + if os.path.exists(STATE_FILE): + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + while tagfile.Step(): + pkgname = tagfile.Section.get("Package") + autoInst = tagfile.Section.get("Auto-Installed") + if pkgname in pkgs: + if options.verbose: + print "changing %s to %s" % (pkgname,action) + newsec = apt_pkg.RewriteSection(tagfile.Section, + [], + [ ("Auto-Installed",str(action)) ] + ) + outfile.write(newsec+"\n") + else: + outfile.write(str(tagfile.Section)+"\n") + # all done, rename the tmpfile + os.rename(outfile.name, STATE_FILE) diff --git a/po/apt-all.pot b/po/apt-all.pot index 6929345af..ebf7c01cb 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-06-26 07:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2426 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -243,7 +243,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@ -531,221 +531,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1558 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:650 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:653 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:656 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:659 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:661 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:665 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:668 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:690 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:694 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:701 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:703 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:756 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:765 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:776 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1857 cmdline/apt-get.cc:1890 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1938 cmdline/apt-get.cc:2174 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:817 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:822 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:825 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:830 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:833 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2028 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:850 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:867 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:869 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -753,74 +753,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:890 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2071 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:980 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2080 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:987 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:991 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:996 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:997 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1031 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1041 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1059 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1070 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1082 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1087 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1092 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -828,79 +828,97 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1111 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1114 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1134 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1142 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1169 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1171 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1177 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1314 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1327 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1385 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1399 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1424 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1626 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1431 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1450 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1545 cmdline/apt-get.cc:1581 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1568 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1598 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1601 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1613 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -908,163 +926,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1621 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1629 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1660 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1731 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1732 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1752 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1755 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1760 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1833 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1933 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:2192 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2031 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2036 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2039 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2045 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2076 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2104 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2116 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2117 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2134 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2153 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2169 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2217 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2269 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2321 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2381 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2399 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2431 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2472 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1349,9 +1363,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 +#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 +#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@ -1544,7 +1558,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:471 msgid "Read error" msgstr "" @@ -1556,7 +1570,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:510 msgid "Write error" msgstr "" @@ -1814,6 +1828,10 @@ msgstr "" msgid "Internal error" msgstr "" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@ -2089,24 +2107,38 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:102 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:131 msgid "Dependency generation" msgstr "" +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:190 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:196 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:103 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2174,19 +2206,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2266,82 +2298,82 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@ -2526,7 +2558,3 @@ msgstr "" #, c-format msgid "Completely removed %s" msgstr "" - -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" -- cgit v1.2.3-70-g09d2 From 9a9665f96e006602950e0e32ce80cb5ee14f5e5f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Jul 2006 09:22:49 +0200 Subject: * apt-pkg/depcache.cc: - create a empty state file if none exists --- apt-pkg/depcache.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7663d3881..25a4372bf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -186,6 +186,15 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) FileFd StateFile; string state = _config->FindDir("Dir::State") + "extended_states"; + + // if it does not exist, create a empty one + if(!FileExists(state)) + { + StateFile.Open(state, FileFd::WriteEmpty); + StateFile.Close(); + } + + // open it if(!StateFile.Open(state, FileFd::ReadOnly)) return _error->Error(_("Failed to open StateFile %s"), state.c_str()); -- cgit v1.2.3-70-g09d2 From a4decc40b3eb085ea994d2a8b31ee9cddfd570ff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Jul 2006 11:00:34 +0200 Subject: * apt-pkg/depcache.cc: - close the outfile properly (thanks to kamion) * cmdline/apt-get.cc: - unbreak dselect-upgrade by adding a ActionGroup around it --- apt-pkg/depcache.cc | 1 + cmdline/apt-get.cc | 2 ++ 2 files changed, 3 insertions(+) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 25a4372bf..369eae70b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -251,6 +251,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) fprintf(OutFile,"\n"); } } + fclose(OutFile); // move the outfile over the real file rename(outfile.c_str(), state.c_str()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 30d046447..8b3c68573 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1771,6 +1771,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) return false; + pkgDepCache::ActionGroup group(Cache); + // Install everything with the install flag set pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) -- cgit v1.2.3-70-g09d2 From 8953292ef197b80c16d08b31830945fb7ac9ff8d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Jul 2006 11:01:59 +0200 Subject: * merged changes from Kamions upload (thanks!) --- apt-pkg/depcache.cc | 1 + debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 25a4372bf..369eae70b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -251,6 +251,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) fprintf(OutFile,"\n"); } } + fclose(OutFile); // move the outfile over the real file rename(outfile.c_str(), state.c_str()); diff --git a/debian/changelog b/debian/changelog index e88ec1e37..297ce020b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.44.2ubuntu3) edgy; urgency=low + + * Close extended_states file after writing it. + + -- Colin Watson Tue, 18 Jul 2006 00:12:13 +0100 + apt (0.6.44.2ubuntu2) edgy; urgency=low * create a empty extended_states file if none exists already -- cgit v1.2.3-70-g09d2 From 1b1c2224f5777956f345471b600ed56203c2d400 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Aug 2006 20:01:46 +0200 Subject: * apt-pkg/depcache.cc: - find new important dependencies on upgrade and deal with them --- apt-pkg/depcache.cc | 28 ++++++++++++- po/apt-all.pot | 118 ++++++++++++++++++++++++++-------------------------- 2 files changed, 86 insertions(+), 60 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 8560ce4fd..6296892ba 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -667,7 +667,33 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, it will be installed. Otherwise we only worry about critical deps */ if (IsImportantDep(Start) == false) continue; - if (Pkg->CurrentVer != 0 && Start.IsCritical() == false) + + /* check if any ImportantDep() (but not Critial) where added + * since we installed the thing + */ + bool isNewImportantDep = false; + if(IsImportantDep(Start) && !Start.IsCritical()) + { + bool found=false; + VerIterator instVer = Pkg.CurrentVer(); + for (DepIterator D = instVer.DependsList(); !D.end(); D++) + { + //FIXME: deal better with or-groups(?) + DepIterator LocalStart = D; + + if(IsImportantDep(Dep) && Start.TargetPkg() == D.TargetPkg()) + found=true; + } + // this is a new dep if it was not found to be already + // a important dep of the installed pacakge + isNewImportantDep = !found; + } + if(isNewImportantDep) + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "new important dependency: " + << Start.TargetPkg().Name() << std::endl; + + if (Pkg->CurrentVer != 0 && Start.IsCritical() == false && !isNewImportantDep) continue; /* If we are in an or group locate the first or that can diff --git a/po/apt-all.pot b/po/apt-all.pot index 095de7f6d..d6d146428 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" +"POT-Creation-Date: 2006-08-09 18:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2389 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1508 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -705,11 +705,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1853 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1901 cmdline/apt-get.cc:2137 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1991 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2034 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2043 msgid "Download complete and in download only mode" msgstr "" @@ -858,60 +858,60 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1315 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1328 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1386 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1405 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1495 cmdline/apt-get.cc:1531 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1518 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1548 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1551 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1563 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -919,163 +919,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1571 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1576 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1579 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1605 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1694 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1695 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1715 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1718 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1723 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1788 cmdline/apt-get.cc:1796 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1896 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1926 cmdline/apt-get.cc:2155 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1970 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1994 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1999 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2002 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2008 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2039 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2067 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2079 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2080 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2097 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2116 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2132 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2160 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2180 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2232 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2284 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2319 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2344 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2362 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2394 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2435 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2100,15 +2100,15 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "" @@ -2238,12 +2238,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" -- cgit v1.2.3-70-g09d2 From 4ef9a929f1cb74f08f764b321cbea62cbfe025a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 11 Aug 2006 11:30:11 +0200 Subject: * cmdline/apt-get.cc: - added "--fix-policy" option to make it easy to fix any not-install recommends * apt-pkg/depcache.{cc,h} - MarkInstall() has a new "ForceImportantDeps" option (defaults to false) to fice the install of recommends even for already installed pkgs - a new PolicyBroken() function to see how much of the recommends are broken --- apt-pkg/depcache.cc | 26 +++-- apt-pkg/depcache.h | 5 +- cmdline/apt-get.cc | 17 ++- po/bg.po | 308 ++++++++++++++++++++++++++------------------------- po/bs.po | 308 ++++++++++++++++++++++++++------------------------- po/ca.po | 308 ++++++++++++++++++++++++++------------------------- po/cs.po | 308 ++++++++++++++++++++++++++------------------------- po/cy.po | 308 ++++++++++++++++++++++++++------------------------- po/da.po | 308 ++++++++++++++++++++++++++------------------------- po/de.po | 308 ++++++++++++++++++++++++++------------------------- po/el.po | 308 ++++++++++++++++++++++++++------------------------- po/en_GB.po | 308 ++++++++++++++++++++++++++------------------------- po/es.po | 308 ++++++++++++++++++++++++++------------------------- po/eu.po | 308 ++++++++++++++++++++++++++------------------------- po/fi.po | 308 ++++++++++++++++++++++++++------------------------- po/fr.po | 308 ++++++++++++++++++++++++++------------------------- po/gl.po | 308 ++++++++++++++++++++++++++------------------------- po/hu.po | 308 ++++++++++++++++++++++++++------------------------- po/it.po | 308 ++++++++++++++++++++++++++------------------------- po/ja.po | 308 ++++++++++++++++++++++++++------------------------- po/ko.po | 308 ++++++++++++++++++++++++++------------------------- po/nb.po | 308 ++++++++++++++++++++++++++------------------------- po/nl.po | 308 ++++++++++++++++++++++++++------------------------- po/nn.po | 308 ++++++++++++++++++++++++++------------------------- po/pl.po | 308 ++++++++++++++++++++++++++------------------------- po/pt.po | 308 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 308 ++++++++++++++++++++++++++------------------------- po/ro.po | 308 ++++++++++++++++++++++++++------------------------- po/ru.po | 308 ++++++++++++++++++++++++++------------------------- po/sk.po | 308 ++++++++++++++++++++++++++------------------------- po/sl.po | 308 ++++++++++++++++++++++++++------------------------- po/sv.po | 310 +++++++++++++++++++++++++++------------------------- po/tl.po | 308 ++++++++++++++++++++++++++------------------------- po/vi.po | 308 ++++++++++++++++++++++++++------------------------- po/zh_CN.po | 308 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 308 ++++++++++++++++++++++++++------------------------- 36 files changed, 5350 insertions(+), 4864 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6296892ba..bfcb8e0eb 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -239,9 +239,11 @@ void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add) { StateCache &State = PkgState[Pkg->ID]; - // The Package is broken + // The Package is broken (either minimal dep or policy dep) if ((State.DepState & DepInstMin) != DepInstMin) iBrokenCount += Add; + if ((State.DepState & DepInstPolicy) != DepInstPolicy) + iPolicyBrokenCount += Add; // Bad state if (Pkg.State() != PkgIterator::NeedsNothing) @@ -596,7 +598,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, - unsigned long Depth) + unsigned long Depth, bool ForceImportantDeps) { if (Depth > 100) return; @@ -664,24 +666,26 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* Check if this dep should be consider for install. If it is a user defined important dep and we are installed a new package then - it will be installed. Otherwise we only worry about critical deps */ + it will be installed. Otherwise we only check for important + deps that have changed from the installed version + */ if (IsImportantDep(Start) == false) continue; - + /* check if any ImportantDep() (but not Critial) where added - * since we installed the thing + * since we installed the package */ bool isNewImportantDep = false; - if(IsImportantDep(Start) && !Start.IsCritical()) + if(!ForceImportantDeps && !Start.IsCritical()) { bool found=false; VerIterator instVer = Pkg.CurrentVer(); - for (DepIterator D = instVer.DependsList(); !D.end(); D++) + for (DepIterator D = instVer.DependsList(); D.end() != true; D++) { //FIXME: deal better with or-groups(?) DepIterator LocalStart = D; - if(IsImportantDep(Dep) && Start.TargetPkg() == D.TargetPkg()) + if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) found=true; } // this is a new dep if it was not found to be already @@ -693,7 +697,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << "new important dependency: " << Start.TargetPkg().Name() << std::endl; - if (Pkg->CurrentVer != 0 && Start.IsCritical() == false && !isNewImportantDep) + // skip important deps if the package is already installed + if (Pkg->CurrentVer != 0 && Start.IsCritical() == false + && !isNewImportantDep && !ForceImportantDeps) continue; /* If we are in an or group locate the first or that can @@ -741,7 +747,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << "Installing " << InstPkg.Name() << " as dep of " << Pkg.Name() << std::endl; - MarkInstall(InstPkg,true,Depth + 1); + MarkInstall(InstPkg,true,Depth + 1, ForceImportantDeps); // Set the autoflag, after MarkInstall because MarkInstall unsets it if (P->CurrentVer == 0) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 3f9f67140..042abb5cc 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -97,6 +97,7 @@ class pkgDepCache : protected pkgCache::Namespace inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;}; inline bool Held() const {return Status != 0 && Keep();}; inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;}; + inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;}; inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;}; inline bool Install() const {return Mode == ModeInstall;}; @@ -134,6 +135,7 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long iDelCount; unsigned long iKeepCount; unsigned long iBrokenCount; + unsigned long iPolicyBrokenCount; unsigned long iBadCount; Policy *delLocalPolicy; // For memory clean up.. @@ -187,7 +189,7 @@ class pkgDepCache : protected pkgCache::Namespace void MarkKeep(PkgIterator const &Pkg,bool Soft = false); void MarkDelete(PkgIterator const &Pkg,bool Purge = false); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, - unsigned long Depth = 0); + unsigned long Depth = 0, bool ForceImportantDeps = false); void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); @@ -201,6 +203,7 @@ class pkgDepCache : protected pkgCache::Namespace inline unsigned long KeepCount() {return iKeepCount;}; inline unsigned long InstCount() {return iInstCount;}; inline unsigned long BrokenCount() {return iBrokenCount;}; + inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;}; inline unsigned long BadCount() {return iBadCount;}; bool Init(OpProgress *Prog); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7b7780a48..58976351c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -628,6 +628,8 @@ void CacheFile::Sort() and verifies that the system is OK. */ bool CacheFile::CheckDeps(bool AllowBroken) { + bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false); + if (_error->PendingError() == true) return false; @@ -639,12 +641,24 @@ bool CacheFile::CheckDeps(bool AllowBroken) if (pkgApplyStatus(*DCache) == false) return false; + if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true) + { + FixBroken = true; + if ((DCache->PolicyBrokenCount() > 0)) + { + // upgrade all policy-broken packages with ForceImportantDeps=True + for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++) + if ((*DCache)[I].NowPolicyBroken() == true) + DCache->MarkInstall(I,true,0,true); + } + } + // Nothing is broken if (DCache->BrokenCount() == 0 || AllowBroken == true) return true; // Attempt to fix broken things - if (_config->FindB("APT::Get::Fix-Broken",false) == true) + if (FixBroken == true) { c1out << _("Correcting dependencies...") << flush; if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0) @@ -2543,6 +2557,7 @@ int main(int argc,const char *argv[]) {0,"arch-only","APT::Get::Arch-Only",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, + {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; diff --git a/po/bg.po b/po/bg.po index ddfac13cc..2aeff7eb5 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-03-31 22:05+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s за %s %s, кПЌпОлОраМ Ма %s %s\n" @@ -433,115 +433,126 @@ msgstr "НяЌа съвпаЎеМОя Ма ОзбПра" msgid "Some files are missing in the package file group `%s'" msgstr "ЛОпсват МякПО файлПве Пт групата с файлПвО пакетО „%s“" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е пПвреЎеМа, файлът е преОЌеМуваМ Ма %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, ПпОт за актуалОзОраМе Ма %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех прО ПтваряМетП Ма файл %s Пт БД: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Датата Ма файла %s е прПЌеМеМа" +msgid "Failed to stat %s" +msgstr "Грешка прО пПлучаваМетП Ма атрОбутО за %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архОва МяЌа пПле „control“" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неуспех прО пПлучаваМетП Ма курсПр" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Неуспех прО четеМетП Ма ЎОректПрОя %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неуспех прО четеМетП Ма %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: ГрешкОте се ПтМасят за файла " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Неуспех прО превръщаМетП Ма %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Неуспех прО ПбхПЎа Ма ЎървПтП" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Неуспех прО ПтваряМетП Ма %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Неуспех прО прПчОтаМетП Ма връзка %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Неуспех прО преЌахваМетП Ма връзка %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Неуспех прО съзЎаваМетП Ма връзка %s къЌ %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "ПревОшеМ лОЌОт Ма DeLink Пт %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Грешка прО пПлучаваМетП Ма атрОбутО за %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "АрхОвът МяЌа пПле „package“" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s МяЌа запОс „override“\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пПЎЎържащОя пакета %s е %s, а Ме %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s МяЌа запОс „override“\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s МяЌа запОс „override“\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -641,7 +652,7 @@ msgstr "Неуспех прО преОЌеМуваМетП Ма %s Ма %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка прО кПЌпОлОраМетП Ма регулярМОя Озраз - %s" @@ -742,121 +753,121 @@ msgstr "%lu за преЌахваМе О %lu без прПЌяМа.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu Ме са МапълМП ОМсталОраМО ОлО преЌахМатО.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "КПрОгОраМе Ма завОсОЌПстОте..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " прПпаЎМа." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Неуспех прО кПрОгОраМетП Ма завОсОЌПстОте" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Неуспех прО ЌОМОЌОзОраМетП Ма МабПра актуалОзацОО" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " ГПтПвП" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "ВъзЌПжМП е Ўа ОзпълМОте „apt-get -f install“, за Ўа кПрОгОрате тезО " "МеОзправМПстО." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "НеуЎПвлетвПреМО завОсОЌПстО. ОпОтайте с „-f“." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: СлеЎМОте пакетО Ме ЌПгат Ўа бъЎат уЎПстПвереМО!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "ПреЎупрежЎеМОетП за уЎПстПверяваМетП е преМебрегМатП.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "ИМсталОраМе Ма тезО пакетО без прПверка [y/N]?" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "НякПО пакетО Ме ЌПжаха Ўа бъЎат уЎПстПвереМО" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "ИЌа прПблеЌО О „-y“ е ОзпПлзваМП без „--force-yes“" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "ВътрешМа грешка, „InstallPackages“ е преЎОзвОкаМП прО счупеМО пакетО!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва Ўа бъЎат преЌахМатО пакетО, МП преЌахваМетП е ОзключеМП." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "ВътрешМа грешка, „Ordering“ Ме завършО" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Неуспех прО заключваМетП Ма ЎОректПрОята за ОзтегляМе" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "СпОсъкът с ОзтПчМОцО Ме ЌПжа Ўа бъЎе прПчетеМ." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "СтраММП.. РазЌерОте Ме съвпаЎат, Озпратете е-пПща Ма apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "НеПбхПЎОЌП е Ўа се Озтеглят %sB/%sB архОвО.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "НеПбхПЎОЌП е Ўа се Озтеглят %sB архОвО.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "СлеЎ разпакетОраМетП ще бъЎе ОзпПлзваМП %sB ЎОскПвП прПстраМствП.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "СлеЎ разпакетОраМетП ще бъЎе ПсвПбПЎеМП %sB ЎОскПвП прПстраМствП.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех прО ПпреЎеляМетП Ма свПбПЎМПтП прПстраМствП в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "НяЌате ЎПстатъчМП свПбПЎМП прПстраМствП в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "УказаМП е „Trivial Only“, МП тПва Ме е трОвОалМа ПперацОя." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Да, правО каквПтП казваЌ!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -867,28 +878,28 @@ msgstr "" "За Ўа прПЎължОте, въвеЎете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "ПрекъсваМе." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Искате лО Ўа прПЎължОте [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех прО ОзтегляМетП Ма %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "НякПО файлПве Ме ЌПжаха Ўа бъЎат ОзтеглеМО" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "ИзтегляМетП завършО в режОЌ саЌП Ма ОзтегляМе" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -896,47 +907,47 @@ msgstr "" "Неуспех прО ОзтегляМетП Ма МякПО архОвО, ЌПже Ўа ОзпълМОте „apt-get update“ " "ОлО Ўа ПпОтате с „--fix-missing“?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ О превключваМе Ма МПсОтелО Ме се пПЎЎържа все Пще" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Неуспех прО кПрОгОраМетП Ма лОпсващОте пакетО." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "ПрекъсваМе Ма ОМсталОраМетП." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Забележете, ОзбОраМе Ма %s вЌестП %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "ПрПпускаМе Ма %s, вече е ОМсталОраМ О Ме е ЌаркОраМ за актуалОзацОя.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакетът %s Ме е ОМсталОраМ, така че Ме е преЌахМат\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е вОртуалеМ пакет, ПсОгуреМ Пт:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [ИМсталОраМ]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Трябва ОзрОчМП Ўа Озберете еЎОМ за ОМсталОраМе." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -947,49 +958,49 @@ msgstr "" "ТПва ЌПже Ўа ПзМачава, че пакета лОпсва, Пстарял е, ОлО е ЎПстъпеМ\n" "саЌП Пт Ўруг ОзтПчМОк\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Обаче слеЎМОте пакетО гП заЌестват:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Пакетът %s МяЌа каМЎОЎат за ОМсталОраМе" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ПреОМсталацОята Ма %s Ме е възЌПжМа, Ме ЌПже Ўа бъЎе ОзтеглеМ.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е Май-МПвата версОя.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е МаЌереМП ОзЎаМОе „%s“ Ма „%s“" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е МаЌереМа версОя „%s“ Ма „%s“" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "ИзбраМа е версОя %s (%s) за %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "КПЌаМЎата „update“ Ме възпрОеЌа аргуЌеМтО" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Неуспех прО заключваМетП Ма ЎОректПрОята със спОсъка Ма пакетОте" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,25 +1008,25 @@ msgstr "" "НякПО ОМЎексМО файлПве Ме ЌПжаха Ўа бъЎат ОзтеглеМО, те са преМебрегМатО ОлО " "са ОзпПлзваМО пП-старО." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "ВътрешМа грешка, „AllUpgrade“ счупО МещП в сОстеЌата" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех прО МаЌОраМетП Ма пакет %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, ОзбОраМе Ма %s за регуляреМ Озраз „%s“\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "ВъзЌПжМП е Ўа ОзпълМОте „apt-get -f install“, за Ўа кПрОгОрате:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1034,7 @@ msgstr "" "НеуЎПвлетвПреМО завОсОЌПстО. ОпОтайте „apt-get -f install“ без пакетО (ОлО " "укажете разрешеМОе)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1046,7 @@ msgstr "" "ЎОстрОбуцОя, че МякПО МеПбхПЎОЌО пакетО Пще Ме са съзЎаЎеМО ОлО пък\n" "са бОлО преЌестеМО Пт Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,123 +1056,123 @@ msgstr "" "Ўа Ме ЌПже Ўа бъЎе ОМсталОраМ; в такъв случай бО трябвалП Ўа се пПЎаЎе\n" "ЎПклаЎ за грешка за тПзО пакет." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "" "СлеЎМата ОМфПрЌацОя ЌПже Ўа пПЌПгМе за МаЌОраМе Ма ОзхПЎ Пт сОтуацОята:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "СчупеМО пакетО" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "СлеЎМОте ЎПпълМОтелМО пакетО ще бъЎат ОМсталОраМО:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "ПреЎлПжеМО пакетО:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "ПрепПръчваМО пакетО:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "ИзчОсляваМе Ма актуалОзацОята..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "ГПтПвП" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "ВътрешМа грешка, „problem resolver“ счупО МещП в сОстеЌата" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Трябва Ўа укажете пПМе еЎОМ пакет за ОзтегляМе Ма ОзхПЎМОя Ќу кПЎ" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех прО МаЌОраМетП Ма ОзхПЎеМ кПЎ Ма пакет %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "ПрПпускаМе Ма вече ОзтеглеМОя файл „%s“\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "НяЌате ЎПстатъчМП свПбПЎМП прПстраМствП в %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "НеПбхПЎОЌП е Ўа се Озтеглят %sB/%sB архОвО ОзхПЎеМ кПЎ.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "НеПбхПЎОЌП е Ўа се Озтеглят %sB архОвО ОзхПЎеМ кПЎ.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "ИзтегляМе Ма ОзхПЎеМ кПЎ %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Неуспех прО ОзтегляМетП Ма МякПО архОвО." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "ПрПпускаМе Ма разпакетОраМетП Ма вече разпакетОраМОя ОзхПЎеМ кПЎ в %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "КПЌаМЎата за разпакетОраМе „%s“ прПпаЎМа.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ПрПверете ЎалО ОЌате ОМсталОраМ пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "КПЌаМЎата за кПЌпОлОраМе „%s“ прПпаЎМа.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "ПрПцесът-пПтПЌък прПпаЎМа" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва Ўа укажете пПМе еЎОМ пакет за прПверка Ма завОсОЌПстО за кПЌпОлОраМе" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех прО пПлучаваМетП Ма ОМфПрЌацОя за завОсОЌПстОте за кПЌпОлОраМе Ма %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s МяЌа завОсОЌПстО за кПЌпОлОраМе.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1170,7 +1181,7 @@ msgstr "" "ЗавОсОЌПст %s за пакета %s Ме ЌПже Ўа бъЎе уЎПвлетвПреМа, пПМеже пакета %s " "Ме ЌПже Ўа бъЎе МаЌереМ" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1180,32 +1191,32 @@ msgstr "" "МалОчМО версОО Ма пакета %s, кПОтП ЌПгат Ўа уЎПвлетвПрят ОзОскваМетП за " "версОя" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех прО уЎПвлетвПряваМетП Ма завОсОЌПст %s за пакета %s: ИМсталОраМОят " "пакет %s е твърЎе МПв" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех прО уЎПвлетвПряваМетП Ма завОсОЌПст %s за пакета %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ЗавОсОЌПстОте за кПЌпОлОраМе Ма %s Ме ЌПжаха Ўа бъЎат уЎПвлетвПреМО." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Неуспех прО ПбрабПтката Ма завОсОЌПстОте за кПЌпОлОраМе" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "ППЎЎържаМО ЌПЎулО:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1388,19 +1399,19 @@ msgstr "СЌесваМе Ма МалОчМата ОМфПрЌацОя" msgid "Failed to create pipes" msgstr "Неуспех прО съзЎаваМетП Ма прПграЌМО каМалО" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Неуспех прО ОзпълМеМОетП Ма gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "РазвалеМ архОв" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "НевярМа кПМтрПлМа суЌа Ма tar, развалеМ архОв" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "НепПзМата заглавМа част Ма TAR тОп %u, елеЌеМт %s" @@ -1681,12 +1692,12 @@ msgstr "ДОскът Ме е МаЌереМ." msgid "File not found" msgstr "Ѐайлът Ме е МаЌереМ" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Неуспех прО пПлучаваМетП Ма атрОбутО" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Неуспех прО заЎаваМетП Ма вреЌе Ма прПЌяМа" @@ -1900,42 +1911,42 @@ msgstr "НещП лПшП се случО прО МаЌОраМетП Ма IP а msgid "Unable to connect to %s %s:" msgstr "Неуспех прО свързваМетП с %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Неуспех прО МаЌОраМетП Ма IP аЎреса Ма „%s“" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: СпОсъкът с аргуЌеМтО Пт Acquire::gpgv::Options е твърЎе Ўълъг. ЗавършваМе " "Ма рабПта." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ВътрешМа грешка: ВалОЎеМ пПЎпОс, МП Ме ЌПже Ўа се прПверО Птпечатъка Ма " "ключа?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "НаЌереМ е пПМе еЎОМ МевалОЎеМ пПЎпОс." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " за прПверка Ма пПЎпОса (ОМсталОраМ лО е gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "НеОзвестМа грешка прО ОзпълМеМОетП Ма gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "СлеЎМОте пПЎпОсО са МевалОЎМО:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2306,24 +2317,24 @@ msgstr "МезаЎължОтелеМ" msgid "extra" msgstr "ЎПпълМОтелеМ" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "ИзгражЎаМе Ма ЎървПтП със завОсОЌПстО" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "ВерсОО каМЎОЎатО" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "ГеМерОраМе Ма завОсОЌПстО" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неуспех прО аМалОзОраМетП Ма пакетеМ файл %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех прО аМалОзОраМетП Ма пакетеМ файл %s (2)" @@ -2457,12 +2468,12 @@ msgstr "МетПЎът %s Ме стартОра правОлМП" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "СлПжете ЎОска, ПзаглавеМ „%s“ в устрПйствП „%s“ О МатОсМете „Enter“." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ПакетМата сОстеЌа „%s“ Ме е пПЎЎържаМа" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех прО ПпреЎеляМетП Ма пПЎхПЎяща пакетМа сОстеЌа" @@ -2779,6 +2790,9 @@ msgstr "Неуспех прО преЌахваМетП Ма %s" msgid "Connection closed prematurely" msgstr "Връзката прекъсМа прежЎевреЌеММП" +#~ msgid "File date has changed %s" +#~ msgstr "Датата Ма файла %s е прПЌеМеМа" + #~ msgid "Reading file list" #~ msgstr "ЧетеМе Ма спОсъка с файлПве" diff --git a/po/bs.po b/po/bs.po index fef208beb..14d363583 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -339,115 +339,126 @@ msgstr "" msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je bila oÅ¡tećena, datoteka preimenovana u %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokuÅ¡avam nadogradnju %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum datoteke je promijenjen %s" +msgid "Failed to stat %s" +msgstr "" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -547,7 +558,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -647,119 +658,119 @@ msgstr "" msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Da, uradi kako kaÅŸem!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -767,75 +778,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li ÅŸelite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -843,79 +854,79 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -923,163 +934,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "PredloÅŸeni paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "NeuspjeÅ¡no" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "PodrÅŸani moduli:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1207,19 +1218,19 @@ msgstr "Sastavljam dostupne informacije" msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Ne mogu izvrÅ¡iti gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "OÅ¡tećena arhiva" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oÅ¡tećena" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1496,12 +1507,12 @@ msgstr "Datoteka nije pronađena" msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" @@ -1712,39 +1723,39 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2109,24 +2120,24 @@ msgstr "opcionalno" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2247,12 +2258,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2552,3 +2563,6 @@ msgstr "Ne mogu ukloniti %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#~ msgid "File date has changed %s" +#~ msgstr "Datum datoteke je promijenjen %s" diff --git a/po/ca.po b/po/ca.po index 33b266d6b..1bf2fd868 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@ -426,115 +426,126 @@ msgstr "No s'ha trobat cap selecció" msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La data del fitxer ha canviat %s" +msgid "Failed to stat %s" +msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "L'arbre està fallant" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "No es pot determinar l'estat de %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s no té una entrada dominant\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s no té una entrada dominant\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -634,7 +645,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -735,121 +746,121 @@ msgstr "%lu a eliminar i %lu no actualitzats.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependÚncies..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependÚncies" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "DependÚncies sense satisfer. Proveu-ho usant -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els segÃŒents paquets!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "QuÚ estrany... les mides no coincideixen, informeu a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -860,28 +871,28 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -889,48 +900,48 @@ msgstr "" "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -941,50 +952,50 @@ msgstr "" "en fa referÚncia. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Tot i que els segÃŒents paquets el reemplacen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -992,25 +1003,25 @@ msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1018,7 +1029,7 @@ msgstr "" "DependÚncies insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1030,7 +1041,7 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1040,124 +1051,124 @@ msgstr "" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "La segÃŒent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els segÃŒents paquets extres:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja descarregat «%s»\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependÚncies de construcció " "per a" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependÚncies de construcció per a %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependÚncies de construcció.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1166,7 +1177,7 @@ msgstr "" "La dependÚncia %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,32 +1186,32 @@ msgstr "" "La dependÚncia %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependÚncia %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependÚncia %s per a %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependÚncies de construcció per a %s" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependÚncies de construcció" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1385,19 +1396,19 @@ msgstr "S'està fusionant la informació disponible" msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" @@ -1679,12 +1690,12 @@ msgstr "No s'ha trobat el disc" msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1897,42 +1908,42 @@ msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "No s'ha pogut resoldre '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " per a verificar la signatura (està instal·lat el gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Les segÃŒents signatures són invàlides:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2298,24 +2309,24 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependÚncies" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "DependÚncies que genera" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" @@ -2445,12 +2456,12 @@ msgstr "El mÚtode %s no s'ha iniciat correctament" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2768,6 +2779,9 @@ msgstr "No es pot eliminar %s" msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "File date has changed %s" +#~ msgstr "La data del fitxer ha canviat %s" + #~ msgid "Reading file list" #~ msgstr "S'està llegint la llista de fitxers" diff --git a/po/cs.po b/po/cs.po index 50a2db1df..51b2f23fb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-14 18:36+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@ -420,115 +420,126 @@ msgstr "ŜádnÃœ vÃœběr nevyhověl" msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je poruÅ¡ená, soubor přejmenován na %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nemohu otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum souboru se změnil %s" +msgid "Failed to stat %s" +msgstr "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nemohu číst adresář %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nemohu vyhodnotit %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Chyby se tÃœkají souboru " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjiÅ¡Å¥ování %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Průchod stromem selhal" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Nemohu přečíst link %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Nemohu odlinkovat %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosaÅŸen.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Nemohu vyhodnotit %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá şádnou poloÅŸku pro override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nemá şádnou poloÅŸku pro override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nemá şádnou poloÅŸku pro override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -628,7 +639,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního vÃœrazu - %s" @@ -729,119 +740,119 @@ msgstr "%lu k odstranění a %lu neaktualizováno.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můşete spustit `apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste pouşít -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou bÃœt autentizovány!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly bÃœt autentizovány" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo pouÅŸito bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s poruÅ¡enÃœmi balíky!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku pouÅŸito dalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovÅ¡em toto není triviální operace." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -852,28 +863,28 @@ msgstr "" "Pro pokračování opiÅ¡te frázi '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "PřeruÅ¡eno." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo staÅŸení %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Některé soubory nemohly bÃœt staÅŸeny" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v reÅŸimu pouze stáhnout" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -881,47 +892,47 @@ msgstr "" "Nemohu stáhnout některé archivy. MoÅŸná spusÅ¥te apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a vÃœměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "PřeruÅ¡uji instalaci." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protoÅŸe je jiÅŸ nainstalován.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovanÃœ:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr "[InstalovanÃœ]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -932,49 +943,49 @@ msgstr "" "To můşe znamenat ÅŸe balík chybí, byl zastarán, nebo je dostupnÃœ\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není moÅŸná, protoÅŸe nelze stáhnout.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je jiÅŸ nejnovější verze.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje şádné argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -982,25 +993,25 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "pouÅŸity starší verze." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární vÃœraz '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můşete spustit `apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1008,7 +1019,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řeÅ¡ení)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1019,7 +1030,7 @@ msgstr "" "nemoÅŸnou situaci, nebo, pokud pouşíváte nestabilní distribuci, ÅŸe\n" "vyÅŸadované balíky jeÅ¡tě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1029,128 +1040,128 @@ msgstr "" "balík není instalovatelnÃœ a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řeÅ¡itel problémů pokazil věci" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro kterÃœ se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojovÃœ balík pro %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve staÅŸenÃœ soubor '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojovÃœch archivů.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojovÃœch archivů.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "StaÅŸení některÃœch archivů selhalo." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení jiÅŸ rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "SynovskÃœ proces selhal" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro kterÃœ budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá şádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůşe bÃœt splněna, protoÅŸe balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1159,31 +1170,31 @@ msgstr "" "%s závislost pro %s nemůşe bÃœt splněna protoÅŸe není k dispozici verze balíku " "%s, která odpovídá poÅŸadavku na verzi" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: InstalovanÃœ balík %s je příliÅ¡ novÃœ" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly bÃœt splněny." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1361,19 +1372,19 @@ msgstr "Slučuji dostupné informace" msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Selhalo spuÅ¡tění gzipu " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "PoruÅ¡enÃœ archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poÅ¡kozenÃœ" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" @@ -1653,12 +1664,12 @@ msgstr "Disk nebyl nalezen." msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1870,39 +1881,39 @@ msgstr "Něco hodně oÅ¡klivého se přihodilo při zjiÅ¡Å¥ování '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nemohu přistoupit ke klíčence: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliÅ¡ dlouhÃœ. Končím." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: DobrÃœ podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatnÃœ podpis. " -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouÅ¡tění gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2269,24 +2280,24 @@ msgstr "volitelnÃœ" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -2412,12 +2423,12 @@ msgstr "Metoda %s nebyla spuÅ¡těna správně" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "VloÅŸte prosím disk nazvanÃœ '%s' do mechaniky '%s' a stiskněte enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo moÅŸno určit vhodnÃœ typ balíčkovacího systému" @@ -2729,6 +2740,9 @@ msgstr "Kompletně odstraněn %s" msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" +#~ msgid "File date has changed %s" +#~ msgstr "Datum souboru se změnil %s" + #~ msgid "Reading file list" #~ msgstr "Čtu seznam souborů" diff --git a/po/cy.po b/po/cy.po index faffe1aa2..ccdeca312 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -164,7 +164,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -449,116 +449,127 @@ msgstr "Dim dewisiadau'n cyfateb" msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Dyddiad ffeil wedi newid %s" +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + #: ftparchive/contents.cc:317 #, fuzzy, c-format msgid "Internal error, could not locate member %s" @@ -659,7 +670,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -765,122 +776,122 @@ msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ar ÃŽl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ÃŽl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -891,29 +902,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,49 +932,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -975,49 +986,49 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1025,27 +1036,27 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1054,7 +1065,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1067,7 +1078,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1076,122 +1087,122 @@ msgstr "" "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1200,7 +1211,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1209,34 +1220,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1422,20 +1433,20 @@ msgstr "Yn cyfuno manylion Ar Gael" msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -1733,12 +1744,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1954,39 +1965,39 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Methwyd datrys '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2363,28 +2374,28 @@ msgstr "opsiynnol" msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -2518,12 +2529,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -2837,6 +2848,9 @@ msgstr "Methwyd dileu %s" msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#~ msgid "File date has changed %s" +#~ msgstr "Dyddiad ffeil wedi newid %s" + #, fuzzy #~ msgid "Reading file list" #~ msgstr "Yn Darllen Rhestr Ffeiliau" diff --git a/po/da.po b/po/da.po index 434c4b348..625eae15d 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-01-20 22:23+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat på %s %s\n" @@ -427,115 +427,126 @@ msgstr "Ingen valg passede" msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var ødelagt, filen omdøbt til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsøger at opgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke åbne DB-filen %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Filens dato er ændret %s" +msgid "Failed to stat %s" +msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markør" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke læse mappen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kunne ikke finde finde %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Fejlene vedrører filen " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Kunne ikke omsætte navnet %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Trævandring mislykkedes" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Kunne ikke åbne %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Kunne ikke 'readlink' %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Kunne ikke frigøre %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lænke %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nåede DeLink-begrænsningen på %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Kunne ikke finde %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen tvangs-post\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen tvangs-post\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -635,7 +646,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -736,118 +747,118 @@ msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Retter afhængigheder..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Færdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autensitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Installér disse pakker uden verifikation (y/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -858,28 +869,28 @@ msgstr "" "For at fortsætte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -887,49 +898,49 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemærk, at %s vælges fremfor %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Du bør eksplicit vælge en at installere." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -940,49 +951,49 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Dog kan følgende pakker erstatte den:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Kunne ikke låse listemappen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -990,25 +1001,25 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1016,7 +1027,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1027,7 +1038,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,119 +1047,119 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n" "ikke installeres og du bør indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1156,7 +1167,7 @@ msgid "" msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,32 +1176,32 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1374,19 +1385,19 @@ msgstr "Sammenfletter tilg msgid "Failed to create pipes" msgstr "Kunne ikke oprette videreførsler" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Kunne ikke udføre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" @@ -1667,12 +1678,12 @@ msgstr "Disk blev ikke fundet." msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -1884,39 +1895,39 @@ msgstr "Der skete noget underligt under navneoms msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Kunne ikke omsætte navnet '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " for at verificere signaturen (er gnupg installeret?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2283,24 +2294,24 @@ msgstr "frivillig" msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Afhængighedsgenerering" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" @@ -2429,12 +2440,12 @@ msgstr "Metoden %s startede ikke korrekt" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2744,6 +2755,9 @@ msgstr "Kunne ikke slette %s" msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#~ msgid "File date has changed %s" +#~ msgstr "Filens dato er ændret %s" + #~ msgid "Reading file list" #~ msgstr "Indlæser fillisten" diff --git a/po/de.po b/po/de.po index 9358ff248..32f6caf1a 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fÃŒr %s %s kompiliert am %s %s\n" @@ -438,115 +438,126 @@ msgstr "Keine Auswahl passt" msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB wurde beschÀdigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ist alt, versuche %s zu erneuern" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kann DB-Datei %s nicht öffnen: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Dateidatum hat sich geÀndert %s" +msgid "Failed to stat %s" +msgstr "Kann auf %s nicht zugreifen." -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv ist keinen Steuerungs-Datensatz" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kann keinen Cursor bekommen" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kann Verzeichnis %s nicht lesen\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kann nicht zugreifen auf %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Konnte %s nicht auflösen" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Baumabschreiten fehlgeschlagen" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Konnte %s nicht öffnen" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Kann kein readlink auf %s durchfÃŒhren" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Konnte %s entfernen (unlink)" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Konnte keine VerknÃŒpfung von %s zu %s anlegen" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Kann auf %s nicht zugreifen." - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s hat keinen Eintrag in der Override-Liste.\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s hat keinen Eintrag in der Override-Liste.\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -646,7 +657,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulÀren Ausdrucks - %s" @@ -748,122 +759,122 @@ msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollstÀndig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "AbhÀngigkeit werden korrigiert..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Kann AbhÀngigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "NichterfÃŒllte AbhÀngigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne ÜberprÃŒfung installieren [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete mÃŒssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Kann kein Lock fÃŒr das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwÃŒrdig... Die Größen haben nicht ÃŒbereingestimmt, schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es mÃŒssen noch %sB von %sB Archiven geholt werden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es mÃŒssen %sB Archive geholt werden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusÀtzlich benutzt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +885,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,48 +914,48 @@ msgstr "" "Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder " "mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstÃŒtzt" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wÀhle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswÀhlen." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,51 +966,51 @@ msgstr "" "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfÃŒgbar ist.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« fÃŒr »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« fÃŒr »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "GewÀhlte Version %s (%s) fÃŒr %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,27 +1018,27 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wÀhle %s fÃŒr reg. Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1035,7 +1046,7 @@ msgstr "" "NichterfÃŒllte AbhÀngigkeiten. Versuchen Sie »apt-get -f install« ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1047,7 +1058,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,124 +1069,124 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung ÃŒber\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusÀtzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket fÃŒr %s nicht finden" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es mÃŒssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es mÃŒssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "ÃŒberprÃŒft werden sollen." -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies fÃŒr %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1184,7 +1195,7 @@ msgstr "" "%s AbhÀngigkeit fÃŒr %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1204,32 @@ msgstr "" "%s AbhÀngigkeit fÃŒr %s kann nicht befriedigt werden, da keine verfÃŒgbare " "Version von Paket %s die Versionsanforderungen erfÃŒllen kann." -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-AbhÀngigkeit fÃŒr %s nicht erfÃŒllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-AbhÀngigkeit fÃŒr %s nicht erfÃŒllen: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-AbhÀngigkeit fÃŒr %s konnte nicht erfÃŒllt werden." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "UnterstÃŒtzte Module:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1406,19 +1417,19 @@ msgstr "FÃŒhre Information zur VerfÃŒgbarkeit zusammen" msgid "Failed to create pipes" msgstr "Konnte Weiterleitungen nicht erzeugen" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Konnte gzip nicht ausfÃŒhren" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Korrumpiertes Archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-PrÃŒfsumme fehlgeschlagen, Archiv korrumpiert" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s" @@ -1704,12 +1715,12 @@ msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kann nicht zugreifen." -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@ -1923,39 +1934,39 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" msgid "Unable to connect to %s %s:" msgstr "Kann nicht mit %s:%s verbinden:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Konnte »%s« nicht auflösen" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Die folgenden zusÀtzlichen Pakete werden installiert:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2322,24 +2333,24 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "AbhÀngigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "AbhÀngigkeits-Generierung" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kann Paketdatei %s nicht parsen (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" @@ -2472,12 +2483,12 @@ msgstr "" " »%s«\n" "in Laufwerk »%s« und drÃŒcken Sie die Eingabetaste.\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstÃŒtzt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@ -2798,6 +2809,9 @@ msgstr "Konnte %s nicht entfernen" msgid "Connection closed prematurely" msgstr "Verbindung zu frÃŒh beendet" +#~ msgid "File date has changed %s" +#~ msgstr "Dateidatum hat sich geÀndert %s" + #~ msgid "Reading file list" #~ msgstr "Paketlisten werden gelesen" diff --git a/po/el.po b/po/el.po index 51143d9cd..e77c0fa4d 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" @@ -163,7 +163,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είΜαι ΌεταγλωττισΌέΜο σε %s %s\n" @@ -444,115 +444,126 @@ msgstr "ΔεΜ ταιριαΟε καΌία επιλογή" msgid "Some files are missing in the package file group `%s'" msgstr "ΛείπουΜ Όερικά αρχεία από τηΜ οΌάΎα πακέτωΜ '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είΜαι κατεστραΌΌέΜη, το αρχείο ΌετοΜοΌάστηκε σε %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση ΎεΜ είΜαι εΜηΌερωΌέΜη, γίΜεται προσπάΞεια Μα αΜαβαΞΌιστεί το %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "΀ο άΜοιγΌά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Η ηΌεροΌηΜία του αρχείου %s έχει αλλάΟει" +msgid "Failed to stat %s" +msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Η αρχειοΞήκη ΎεΜ περιέχει πεΎίο ελέγχου" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "ΑΎύΜατη η πρόσβαση σε Ύείκτη" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: ΑΎύΜατη η αΜάγΜωση του καταλόγου %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: ΑΎύΜατη η εύρεση της κατάστασης του %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: ΣφάλΌατα στο αρχείο" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "ΑΎύΜατη η εύρεση του %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Αποτυχία αΜεύρεσης" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία αΜοίγΌατος του %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "ΑποσύΜΎεση %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία αΜάγΜωσης του %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύΜΎεσης του %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύΜΎεσης του %s Όε το %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " ΑποσύΜΎεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Αποτυχία εύρεσης της κατάστασης του %s." - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Η αρχειοΞήκη ΎεΜ περιέχει πεΎίο πακέτωΜ" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s ΎεΜ περιέχει εγγραφή παράκαΌψης\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συΜτηρητής είΜαι ο %s όχι ο %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s ΎεΜ περιέχει εγγραφή παράκαΌψης\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s ΎεΜ περιέχει εγγραφή παράκαΌψης\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -652,7 +663,7 @@ msgstr "Αποτυχία ΌετοΜοΌασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλΌα ΌεταγλωτισΌου - %s" @@ -753,123 +764,123 @@ msgstr "%lu Ξα αφαιρεΞούΜ και %lu ΎεΜ αΜαβαΞΌίζοΜτ msgid "%lu not fully installed or removed.\n" msgstr "%lu Όη πλήρως εγκατεστηΌέΜα ή αφαιρέΞηκαΜ.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "ΔιόρΞωση εΟαρτήσεωΜ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "ΑΎύΜατη η ΎιόρΞωση τωΜ εΟαρτήσεωΜ" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "ΑΎύΜατη η ελαχιστοποίηση του συΜόλου αΜαβαΞΌίσεωΜ" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " ΕτοιΌο" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως Μα πρέπει Μα τρέΟετε apt-get -f install για Μα ΎιορΞώσετε αυτά τα " "προβλήΌατα." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "ΑΜεπίλυτες εΟαρτήσεις. ΔοκιΌάστε Όε το -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΀α ακόλουΞα πακέτα ΎεΜ εΟακριβώΞηκαΜ!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "ΠαράκαΌψη προειΎοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση τωΜ πακέτωΜ χωρίς επαλήΞευση [Îœ/Ο]; " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα ΎεΜ εΟαακριβώΞηκαΜ" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "ΥπάρχουΜ προβλήΌατα και Ύώσατε -y χωρίς το --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλΌα, έγιΜε κλήση του Install Packages Όε σπασΌέΜα πακέτα!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει Μα αφαιρεΞούΜ αλλά η Αφαίρεση είΜαι απεΜεργοποιηΌέΜη." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό ΣφάλΌα, η ΀αΟιΜόΌηση ΎεΜ ολοκληρώΞηκε" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "ΑΎύΜατο το κλείΎωΌα του καταλόγου Όεταφόρτωσης" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "ΑΎύΜατη η αΜάγΜωση της λίστας πηγώΜ." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! ΀α ΌεγέΞη ΎεΜ ταιριάζουΜ, στείλτε ΌήΜυΌα στο apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται Μα ΌεταφορτωΞούΜ %sB/%sB από αρχεία.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται Μα ΌεταφορτωΞούΜ %sB από αρχεία.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά τηΜ αποσυΌπίεση Ξα χρησιΌοποιηΞούΜ %sB χώρου από το Ύίσκο.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά τηΜ αποσυΌπίεση Ξα ελευΞερωΞούΜ %sB χώρου από το Ύίσκο.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "ΔεΜ Όπόρεσα Μα προσΎιορίσω τοΜ ελεύΞερο χώρο στο %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "ΔεΜ ΎιαΞέτετε αρκετό ελεύΞερο χώρο στο %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "ΚαΞορίσατε συΜηΞισΌέΜο, αλλά αυτή ΎεΜ είΜαι Όια συΜηΞισΌέΜη εργασία" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ναι, καΜε ότι λέω!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +891,28 @@ msgstr "" "Για Μα συΜεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε Μα συΜεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία αΜάκτησης του %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Για Όερικά αρχεία απέτυχε η Όεταφόρτωση" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "ΟλοκληρώΞηκε η Όεταφόρτωση ΌόΜο" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,49 +920,49 @@ msgstr "" "ΑΎύΜατη η Όεταφόρτωση ΌερικώΜ αρχείωΜ, ίσως αΜ ΎοκιΌάζατε Όε apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συΜΎυασΌός --fix-missing Όε εΜαλλαγή ΌέσωΜ ΎεΜ υποστηρίζεται για τηΜ ώρα" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "ΑΎύΜατη η επίλυση τωΜ χαΌέΜωΜ πακέτωΜ." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "ΣηΌείωση, επιλέχΞηκε το %s αΜτί του%s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "ΠαράκαΌψη του %s, είΜαι εγκατεστηΌέΜο και η αΜαβάΞΌιση ΎεΜ έχει οριστεί.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "΀ο πακέτο %s ΎεΜ είΜαι εγκατεστηΌέΜο και ΎεΜ Ξα αφαιρεΞεί\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "΀ο πακέτο %s είΜαι εικοΜικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [ΕγκατεστηΌέΜα]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς Μα επιλέΟετε έΜα για εγκατάσταση." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -963,51 +974,51 @@ msgstr "" "Αυτό σηΌαίΜει ότι το πακέτο αυτό λείπει, είΜαι παλαιωΌέΜο, ή είΜαι ΎιαΞέσιΌο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουΞο πακέτο το αΜτικαΞιστά:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "΀ο πακέτο %s ΎεΜ είΜαι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επαΜεγκατάσταση του %s ΎεΜ είΜαι εφικτή, ΎεΜ είΜαι ΎυΜατή η Όεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είΜαι ήΎη η τελευταία έκΎοση.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκΎοση %s για το%s ΎεΜ βρέΞηκε" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκΎοση %s για το %s ΎεΜ βρέΞηκε" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "ΕπιλέχΞηκε η έκΎοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Η εΜτολή update ΎεΜ παίρΜει ορίσΌατα" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "ΑΎύΜατο το κλείΎωΌα του καταλόγου" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1015,25 +1026,25 @@ msgstr "" "Μερικά αρχεία ΎεΜ ΌεταφορτώΞηκαΜ, αγΜοήΞηκαΜ ή χρησιΌοποιήΞηκαΜ παλαιότερα " "στη Ξέση τους." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό ΣφάλΌα, Η ΎιαΎικασία αΜαβάΞΌισης χάλασε" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "ΑΎύΜατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ΣηΌείωση, επιλέχτηκε το %s στη Ξέση του '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "AÎœ τρέΟετε 'apt-get f install' ίσως Μα ΎιορΞώσετε αυτά τα προβλήΌατα:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1041,7 +1052,7 @@ msgstr "" "ΑΜεπίλυτες εΟαρτήσεις. ΔοκιΌάστε 'apt-get -f install' χωρίς Μα ορίσετε " "πακέτο (ή καΞορίστε Όια λύση)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1053,7 +1064,7 @@ msgstr "" "ΎιαΜοΌή, ότι Όερικά από τα πακέτα ΎεΜ έχουΜ ακόΌα ΎηΌιουργηΞεί ή έχουΜ\n" "ΌετακιΜηΞεί από τα εισερχόΌεΜα." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1063,124 +1074,124 @@ msgstr "" "το πακέτο αυτό ΎεΜ είΜαι εγκαταστάσιΌο και Ξα πρέπει Μα κάΜετε Όια\n" "αΜαφορά σφάλΌατος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουΞες πληροφορίες ίσως βοηΞήσουΜ στηΜ επίλυση του προβλήΌατος:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "ΧαλασΌέΜα πακέτα" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "΀α ακόλουΞα επιπλέοΜ πακέτα Ξα εγκατασταΞούΜ:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "ΠροτειΜόΌεΜα πακέτα:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "ΣυΜιστώΌεΜα πακέτα:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "ΥπολογισΌός της αΜαβάΞΌισης... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "ΕτοιΌο" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό ΣφάλΌα, η προσπάΞεια επίλυσης του προβλήΌατος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει Μα καΞορίσετε τουλάχιστοΜ έΜα πακέτο για Μα Όεταφορτώσετε τοΜ " "κωΎικάτου" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "ΑΎυΜαΌία εΜτοπισΌού του κώΎικά του πακέτου %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "ΠαράκαΌψη του ήΎη ΌεταφορτωΌέΜου αρχείου `%s`\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "ΔεΜ ΎιαΞέτετε αρκετό ελεύΞερο χώρο στο %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται Μα ΌεταφορτωΞούΜ %sB/%sB πηγαίου κώΎικα.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται Μα ΌεταφορτωΞούΜ %sB πηγαίου κώΎικα.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση ΚωΎικα %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Αποτυχία Όεταφόρτωσης ΌερικώΜ αρχειοΞηκώΜ." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "ΠαράκαΌψη της αποσυΌπίεσης ήΎη ΌεταφορτωΌέΜου κώΎικα στο %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εΜτολή αποσυΌπίεσης %s\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ΕλέγΟτε αΜ είΜαι εγκαταστηΌέΜο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εΜτολή χτισίΌατος %s.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Η απογοΜική Ύιεργασία απέτυχε" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει Μα καΞορίσετε τουλάχιστοΜ έΜα πακέτο για έλεγχο τωΜ εΟαρτήσεωΜ του" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ΑΎύΜατη η εύρεση πληροφοριώΜ χτισίΌατος για το %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "το %s ΎεΜ έχει εΟαρτήσεις χτισίΌατος.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1199,7 @@ msgid "" msgstr "" "%s εΟαρτήσεις για το %s ΎεΜ ικαΜοποιούΜται επειΎή το πακέτο %s ΎεΜ βρέΞηκε" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1208,32 @@ msgstr "" "%s εΟαρτήσεις για το %s ΎεΜ ικαΜοποιούΜται επειΎή ΎεΜ υπάρχουΜ ΎιαΞέσιΌες " "εκΎόσεις του πακέτου %s που Μα ικαΜοποιούΜ τις απαιτήσεις έκΎοσης" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικαΜοποίησης %s εΟαρτήσεωΜ για το %s: ΀ο εγκατεστηΌέΜο πακέτο %s " "είΜαι Μεώτερο" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικαΜοποίησης %s εΟάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εΟαρτήσεις χτισίΌατος για το %s ΎεΜ ικαΜοποιούΜται." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεΟεργασίας εΟαρτήσεωΜ χτισίΌατος" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "ΥποστηριζόΌεΜοι ΟΎηγοί:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1406,19 +1417,19 @@ msgstr "ΣύΌπτυΟη ΔιαΞέσιΌωΜ ΠληροφοριώΜ" msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη ΎηΌιουργία ΎιασωληΜώσεωΜ" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά τηΜ εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "ΚατεστραΌΌέΜη αρχειοΞήκη" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "΀ο Checksum του tar απέτυχε, η αρχείοΞήκη είΜαι κατεστραΌΌέΜη" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "ΆγΜωστη επικεφαλίΎα TAR τύπος %u, Όέλος %s" @@ -1698,12 +1709,12 @@ msgstr "Ο Ύίσκος ΎεΜ βρέΞηκε." msgid "File not found" msgstr "΀ο αρχείο Δε ΒρέΞηκε" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Αποτυχία ορισΌού του χρόΜου τροποποίησης" @@ -1915,40 +1926,40 @@ msgstr "Κάτι παράΟεΜο συΜέβη κατά τηΜ εύρεση το msgid "Unable to connect to %s %s:" msgstr "ΑΎύΜατη η σύΜΎεση στο %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "ΑΎύΜατη η εύρεση του '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "Ε: Λίστα ΟρισΌάτωΜ από Acquire::gpgv::Options πολύ Όεγάλη. ΈΟοΎος." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλΌα: Η υπογραφή είΜαι καλή, αλλά αΎυΜαΌία προσΎιορισΌού του " "αποτυπώΌατος?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "ΒρέΞηκε τουλάχιστοΜ Όια Όη έγκυρη υπογραφή." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " για τηΜ επαλήΞευση της υπογραφής (είΜαι εγκατεστηΌέΜο το gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "ΆγΜωστο σφάλΌα κατά τηΜ εκτέλεση του gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταΜ Όη έγκυρες:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2320,24 +2331,24 @@ msgstr "προαιρετικό" msgid "extra" msgstr "επιπλέοΜ" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Κατασκευή ΔέΜΎρου ΕΟαρτήσεωΜ" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Υποψήφιες ΕκΎόσεις" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Παραγωγή ΕΟαρτήσεωΜ" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "ΑΎύΜατη η αΜάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "ΑΎύΜατη η αΜάλυση του αρχείου πακέτου %s (2)" @@ -2468,12 +2479,12 @@ msgstr "" "Παρακαλώ εισάγετε το Ύίσκο Όε ετικέτα '%s' στη συσκευή '%s' και πατήστε " "enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "΀ο σύστηΌα συσκευασίας '%s' ΎεΜ υποστηρίζεται" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "ΑΎύΜατος ο καΞορισΌός εΜός κατάλληλου τύπου συστήΌατος πακέτωΜ" @@ -2788,6 +2799,9 @@ msgstr "Αποτυχία Ύιαγραφής του %s" msgid "Connection closed prematurely" msgstr "Η σύΜΎεση έκλεισε πρόωρα" +#~ msgid "File date has changed %s" +#~ msgstr "Η ηΌεροΌηΜία του αρχείου %s έχει αλλάΟει" + #~ msgid "Reading file list" #~ msgstr "ΑΜάγΜωση ΛιστώΜ ΑρχείωΜ" diff --git a/po/en_GB.po b/po/en_GB.po index 34d1bdecb..cf1e7c5fb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" @@ -422,115 +422,126 @@ msgstr "No selections matched" msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "File date has changed %s" +msgid "Failed to stat %s" +msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E:" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W:" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Failed to stat %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s has no override entry\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s has no override entry\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -630,7 +641,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -731,118 +742,118 @@ msgstr "%lu to remove and %lu not upgraded.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimize the upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "After unpacking %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -853,28 +864,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -882,47 +893,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -933,49 +944,49 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -983,25 +994,25 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1009,7 +1020,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1021,7 +1032,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1031,119 +1042,119 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calculating upgrade..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1163,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,31 +1172,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1365,19 +1376,19 @@ msgstr "Merging available information" msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" @@ -1657,12 +1668,12 @@ msgstr "Disk not found." msgid "File not found" msgstr "File not found" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1874,39 +1885,39 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" msgid "Unable to connect to %s %s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Could not resolve ‘%s’" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " to verify signature (is gnupg installed?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2272,24 +2283,24 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" @@ -2417,12 +2428,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2730,6 +2741,9 @@ msgstr "Failed to remove %s" msgid "Connection closed prematurely" msgstr "Connection closed prematurely" +#~ msgid "File date has changed %s" +#~ msgstr "File date has changed %s" + #~ msgid "Reading file list" #~ msgstr "Reading file list" diff --git a/po/es.po b/po/es.po index c8c1e5237..0cd4b2dc1 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-11-16 17:37+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -435,115 +435,126 @@ msgstr "Ninguna selecci msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD corrompida, archivo renombrado a %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Cambió la fecha del archivo %s" +msgid "Failed to stat %s" +msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo '" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Falló el recorrido por el árbol." -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al límite de %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "No pude leer %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s no tiene entrada de predominio\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s no tiene entrada de predominio\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -643,7 +654,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -744,121 +755,121 @@ msgstr "%lu para eliminar y %lu no actualizados.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " falló." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticación ignorado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estos paquetes sin verificación [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó el ordenamiento" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro.. Los tamaños no concuerdan, mande un correo a \n" "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de desempaquetar.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +880,28 @@ msgstr "" "Para continuar escriba la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,47 +909,47 @@ msgstr "" "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abortando la instalación." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminará\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explícitamente uno para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -949,49 +960,49 @@ msgstr "" "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalación" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución '%s' para '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión '%s' para '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versión seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -999,25 +1010,25 @@ msgstr "" "Algunos archivos de índice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresión regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1025,7 +1036,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1037,7 +1048,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1047,123 +1058,123 @@ msgstr "" "paquete simplemente no sea instalable y debería de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió\n" "algunas cosas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construcción" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1172,7 +1183,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1181,32 +1192,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n" "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,19 +1405,19 @@ msgstr "Fusionando informaci msgid "Failed to create pipes" msgstr "No pude crear las tuberías" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "No se aprobó la suma de control del tar, archive corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" @@ -1687,12 +1698,12 @@ msgstr "Disco no encontrado." msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -1904,40 +1915,40 @@ msgstr "Algo raro pas msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "No pude resolver '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " para verificar la firma (¿está instalado gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2307,24 +2318,24 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generación de dependencias" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" @@ -2455,12 +2466,12 @@ msgstr "El m msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no está soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@ -2779,6 +2790,9 @@ msgstr "No pude borrar %s" msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" +#~ msgid "File date has changed %s" +#~ msgstr "Cambió la fecha del archivo %s" + #~ msgid "Reading file list" #~ msgstr "Leyendo Lista de Archivos" diff --git a/po/eu.po b/po/eu.po index 1e8763e16..38e6c7d64 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-06-17 00:10+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" @@ -426,115 +426,126 @@ msgstr "Ez dago bat datorren hautapenik" msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fitxategi-data aldatu egin da: %s" +msgid "Failed to stat %s" +msgstr "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol-erregistrorik" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Ezin da %s direktorioa irakurri\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Ezin da %s atzitu\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Erroreak fitxategiari dagozkio " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Huts egin du %s ebaztean" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Huts egin dute zuhaitz-urratsek" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Huts egin du %s irekitzean" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Huts egin du %s esteka irakurtzean" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Huts egin du %s desestekatzean" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Ezin izan da %s %s(r)ekin estekatu" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Huts egin du %s(e)tik datuak lortzean" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete-eremurik" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s: ez du override sarrerarik\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s: ez du override sarrerarik\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -634,7 +645,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" @@ -735,120 +746,120 @@ msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -859,28 +870,28 @@ msgstr "" "Jarratzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -888,47 +899,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -939,49 +950,49 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -989,25 +1000,25 @@ msgstr "" "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1026,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1027,7 +1038,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,121 +1047,121 @@ msgstr "" "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1158,7 +1169,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1167,32 +1178,32 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1373,19 +1384,19 @@ msgstr "Eskuragarrien datuak biltzen" msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "%u TAR goiburu-mota ezezaguna, %s kidea" @@ -1667,12 +1678,12 @@ msgstr "Ez da diska aurkitu" msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa-ordua ezartzean" @@ -1888,39 +1899,39 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Ezin da eraztuna ebatzi: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2290,24 +2301,24 @@ msgstr "aukerakoa" msgid "extra" msgstr "estra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Hautagaien bertsioak" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete-fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" @@ -2435,12 +2446,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@ -2749,3 +2760,6 @@ msgstr "%s guztiz ezabatu da" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" + +#~ msgid "File date has changed %s" +#~ msgstr "Fitxategi-data aldatu egin da: %s" diff --git a/po/fi.po b/po/fi.po index 09e19269c..163fc9dc0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s kÀÀnnöksen pÀivÀys %s %s\n" @@ -431,115 +431,126 @@ msgstr "MitkÀÀn valinnat eivÀt tÀsmÀnneet" msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmÀstÀ \"%s\" puuttuu joitain tiedostoja" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetÀÀn pÀivittÀÀ %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Tiedoston uusi pÀivÀys %s" +msgid "Failed to stat %s" +msgstr "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kansiota %s ei voi lukea\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Tdstolle %s ei toimi stat\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Tiedostossa virheitÀ " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Osoitteen %s selvitys ei onnistunut" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Puun lÀpikÀynti ei onnistunut" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ei onnistunut" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ei onnistunut" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linkin %s -> %s luonti ei onnistunut" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin ylÀraja %st saavutettu.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Tiedostolle %s ei toimi stat" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttÀÀ" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s: ei poikkeustietuetta\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s yllÀpitÀjÀ on %s eikÀ %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s: ei poikkeustietuetta\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s: ei poikkeustietuetta\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -639,7 +650,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "KÀÀnnösvirhe lausekkeessa - %s" @@ -741,120 +752,120 @@ msgstr "%lu poistettavaa ja %lu pÀivittÀmÀtöntÀ.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "PÀivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nÀmÀ." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "TyydyttÀmÀttömiÀ riippuvuuksia. Koita kÀyttÀÀ -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperÀÀ ei voi varmistaa!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nÀmÀ paketit ilman todennusta [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperÀstÀ ei voitu varmistua" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y kÀytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitÀisi poistaa mutta Remove ei ole kÀytössÀ." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisÀinen virhe lisÀttÀessÀ korvautusta" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "LÀhteiden luetteloa ei pystynyt lukemaan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jÀlkeen kÀytetÀÀn %st lisÀÀ levytilaa.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jÀlkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Kansiossa %s ei ole riittÀvÀsti vapaata tilaa" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittÀvÀsti vapaata tilaa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On mÀÀritetty Trivial Only mutta tÀmÀ ei ole itsestÀÀnselvÀ toimenpide." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "KyllÀ, tee kuten kÀsketÀÀn!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,28 +876,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "KeskeytÀ." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja mÀÀrÀtty vain nouto" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -894,47 +905,47 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkÀ \"apt-get update\"auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Asennus keskeytetÀÀn." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikÀ %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikÀ ole komennettu pÀivitystÀ.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpÀ sitÀ ei poisteta\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on nÀennÀispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Yksi pitÀÀ valita asennettavaksi." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,49 +956,49 @@ msgstr "" "TÀmÀ voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lÀhteestÀ\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitÀ ei voi noutaa.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Komento update ei kÀytÀ parametreja" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,25 +1006,25 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "kÀytetty vanhoja. " -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "SisÀinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nÀmÀ:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1021,7 +1032,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1032,7 +1043,7 @@ msgstr "" "jos kÀytetÀÀn epÀvakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielÀ luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,121 +1053,121 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtÀvÀ vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyÀ selvitettÀessÀ tilannetta:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "RikkinÀiset paketit" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimÀÀrÀiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "KÀsitellÀÀn pÀivitystÀ ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "SisÀinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lÀhdekoodi noudetaan" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lÀhdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan purku jo puretun lÀhdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittÀvÀsti vapaata tilaa" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lÀhdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lÀhdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lÀhdekoodi %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lÀhdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole mÀÀritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1175,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttÀÀ koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1184,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttÀÀ koska mikÀÀn paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttÀÀ: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttÀÀ: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttÀÀ." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien kÀsittely ei onnistunut" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1379,19 +1390,19 @@ msgstr "YhdistetÀÀn saatavuustiedot" msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei tÀsmÀÀ, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" @@ -1672,12 +1683,12 @@ msgstr "Tiedostoa ei löydy" msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Tiedoston muutospÀivÀmÀÀrÀÀ ei saatu vaihdettua" @@ -1889,39 +1900,39 @@ msgstr "Jotain kenkkua tapahtui selvitettÀessÀ \"%s: %s\" (%i)" msgid "Unable to connect to %s %s:" msgstr "Ei ole mahdollista muodostaa yhteyttÀ %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "NimeÀ \"%s\" ei voitu selvittÀÀ" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Seuraavat ylimÀÀrÀiset paketit on merkitty asennettaviksi:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2285,24 +2296,24 @@ msgstr "valinnainen" msgid "extra" msgstr "ylimÀÀrÀinen" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jÀsentÀÀ" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jÀsentÀÀ" @@ -2431,12 +2442,12 @@ msgstr "" "\"%s\"\n" "asemaan \"%s\" ja paina Enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "PaketointijÀrjestelmÀ \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijÀrjestelmÀn tyyppiÀ ei saa selvitettyÀ" @@ -2751,6 +2762,9 @@ msgstr "Tiedoston %s poistaminen ei onnistunut" msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" +#~ msgid "File date has changed %s" +#~ msgstr "Tiedoston uusi pÀivÀys %s" + #~ msgid "Reading file list" #~ msgstr "Luetaan tiedostoluetteloa" diff --git a/po/fr.po b/po/fr.po index b9899ab69..167b5a9f1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-18 09:31-0500\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compilé le %s %s\n" @@ -437,115 +437,126 @@ msgid "Some files are missing in the package file group `%s'" msgstr "" "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Base de données corrompue, fichier renommé en %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Base de données ancienne, tentative de mise à jour de %s\"" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La date du fichier a changé %s" +msgid "Failed to stat %s" +msgstr "Impossible de statuer %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archive n'a pas d'enregistrement de contrôle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A : Impossible de lire le contenu du répertoire %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A : Impossible de statuer %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E : " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A : " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E : des erreurs sont survenues sur le fichier " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Impossible de résoudre %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Échec du parcours de l'arbre" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Délier %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Impossible de délier %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossible de lier %s à %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Impossible de statuer %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr "%s ne possède pas d'entrée « override »\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr "%s ne possède pas d'entrée « override »\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -645,7 +656,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -747,114 +758,114 @@ msgstr "%lu msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Correction des dépendances..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " a échoué." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dépendances" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis à jour" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignoré.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "" "Les paquets doivent être enlevés mais la désinstallation est désactivée." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel à apt@packages.debian.org." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nécessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@ -862,11 +873,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +888,28 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,48 +917,48 @@ msgstr "" "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, sélection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installé]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sélectionner un paquet à installer." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,50 +970,50 @@ msgstr "" "devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,26 +1021,26 @@ msgstr "" "Le téléchargement de quelques fichiers d'index a échoué, ils ont été " "ignorés, ou les anciens ont été utilisés à la place." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1037,7 +1048,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1049,7 +1060,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,123 +1069,123 @@ msgstr "" "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1183,7 +1194,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1192,33 +1203,33 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1405,19 +1416,19 @@ msgstr "Fusion des informations disponibles" msgid "Failed to create pipes" msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" @@ -1702,12 +1713,12 @@ msgstr "Disque non trouv msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1923,43 +1934,43 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter à %s %s :" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Impossible d'accèder au porte-clés : « %s »" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Impossible d'exécuter « %s » pour contrôler la signature\n" "(veuillez vérifier si gnupg est installé)." -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2327,24 +2338,24 @@ msgstr "optionnel" msgid "extra" msgstr "supplémentaire" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Construction de l'arbre des dépendances" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Génération des dépendances" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" @@ -2481,12 +2492,12 @@ msgstr "" "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " "touche Entrée." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" @@ -2811,3 +2822,6 @@ msgstr "%s compl #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" + +#~ msgid "File date has changed %s" +#~ msgstr "La date du fichier a changé %s" diff --git a/po/gl.po b/po/gl.po index cc522e58d..d497de395 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-11 18:09+0200\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -432,116 +432,127 @@ msgstr "Ningunha selección encaixou" msgid "Some files are missing in the package file group `%s'" msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\"" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" "A base de datos estaba corrompida, cambiouse o nome do ficheiro a %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, trátase de actualizar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "A data do ficheiro cambiou %s" +msgid "Failed to stat %s" +msgstr "Non se atopou %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Non se puido obter un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Non se puido ler o directorio %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Non se atopou %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Os erros aplícanse ao ficheiro " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Non se puido resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "O percorrido da árbore fallou" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Non se puido abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DesLig %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Non se puido ler a ligazón %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Non se puido borrar %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Non se puido ligar %s con %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Non se atopou %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s non ten unha entrada de \"override\"\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s non ten unha entrada de \"override\"\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -641,7 +652,7 @@ msgstr "Non se puido cambiar o nome de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@ -742,119 +753,119 @@ msgstr "%lu hanse eliminar e %lu sen actualizar.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou eliminados de todo.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "A corrixir as dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Non se puido corrixir as dependencias." -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Non se puido minimizar o xogo de actualizacións" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Rematado" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estes paquetes sen verificación [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Houbo problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que recibir %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre de abondo en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,28 +876,28 @@ msgstr "" "Para continuar escriba a frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -894,49 +905,49 @@ msgstr "" "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está " "soportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -947,49 +958,49 @@ msgstr "" "Isto pode significar que o paquete falla, está obsoleto ou só está\n" "dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,25 +1008,25 @@ msgstr "" "Non se puido descargar algúns ficheiros de índices; ignoráronse ou " "empregáronse uns vellos no seu lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1034,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1034,7 +1045,7 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,122 +1054,122 @@ msgstr "" "Xa que só solicitou unha soa operación, é bastante probable que o\n" "paquete non sea instalable e que se deba informar dun erro no paquete." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1167,7 +1178,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1176,32 +1187,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1384,19 +1395,19 @@ msgstr "A mesturar a información sobre paquetes dispoñibles" msgid "Failed to create pipes" msgstr "Non se puido crear as canles" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Non se puido executar gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" @@ -1676,12 +1687,12 @@ msgstr "Non se atopou o disco" msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Non se atopou" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1894,43 +1905,43 @@ msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" msgid "Unable to connect to %s %s:" msgstr "Non se pode conectar a %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Non se puido acceder ao chaveiro: \"%s\"" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg " "instalado?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2297,24 +2308,24 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "A construír a árbore de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" @@ -2441,12 +2452,12 @@ msgstr "O método %s non se iniciou correctamente" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" @@ -2763,6 +2774,9 @@ msgstr "Eliminouse %s completamente" msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#~ msgid "File date has changed %s" +#~ msgstr "A data do ficheiro cambiou %s" + #~ msgid "Reading file list" #~ msgstr "A ler a lista de paquetes" diff --git a/po/hu.po b/po/hu.po index fdc39aba1..e9fdee0b9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-07-02 07:34+0100\n" "Last-Translator: SZERVÑC Attila \n" "Language-Team: Hungarian \n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@ -429,115 +429,126 @@ msgstr "Nincs illeszkedő kiválasztás" msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB megsérÃŒlt, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "A fájl dátuma megváltozott %s" +msgid "Failed to stat %s" +msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nem sikerÃŒlt egy mutatóhoz jutni" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "H: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "F: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerÃŒlt feloldani ezt: %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Fabejárás nem sikerÃŒlt" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "unlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése ehhez: %s sikertelen" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s elérése sikertelen" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felÃŒlbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nem rendelkezik felÃŒlbíráló bejegyzéssel\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nem rendelkezik felÃŒlbíráló bejegyzéssel\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -637,7 +648,7 @@ msgstr "Nem sikerÃŒlt átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -738,118 +749,118 @@ msgstr "%lu eltávolítandó és %lu nem frissített.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "FÃŒggőségek javítása..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a fÃŒggőségeket" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen fÃŒggőségek. Próbáld a -f használatával." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetést átléptem.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Valóban telepíted e csomagokat ellenőrzés nélkÃŒl (i/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkÃŒl" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő az archívumokból: %sB/%sB\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltés az archívumokból: %sB\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Kicsomagolás után %sB lemezterÃŒletet használok fel\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterÃŒlet szabadul fel.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -860,28 +871,28 @@ msgstr "" "A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerÃŒlt letölteni" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -889,47 +900,47 @@ msgstr "" "Nem lehet letölteni néhány archívumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -939,49 +950,49 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá\n" ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -989,25 +1000,25 @@ msgstr "" "Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " "változatukat használom." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1026,7 @@ msgstr "" "Teljesítetlen fÃŒggőségek. Próbáld az 'apt-get -f install'-t csomagok nélkÃŒl " "(vagy telepítsd a fÃŒggőségeket is!)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1027,7 +1038,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készÃŒlt el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1037,122 +1048,122 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerÃŒlnek telepítésre:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Nem sikerÃŒlt néhány archívumot letölteni." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerÃŒlt.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerÃŒlt.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási fÃŒggőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-fÃŒggőség információját beszerezni" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási fÃŒggősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1161,7 +1172,7 @@ msgstr "" "%s fÃŒggősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1170,32 +1181,32 @@ msgstr "" "%s fÃŒggősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s fÃŒggőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s fÃŒggőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési fÃŒggőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Nem sikerÃŒlt az építési fÃŒggőségeket feldolgozni" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1373,19 +1384,19 @@ msgstr "Elérhető információk egyesítése" msgid "Failed to create pipes" msgstr "Nem sikerÃŒlt csöveket létrehozni" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Nem sikerÃŒlt a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérÃŒlt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag" @@ -1665,12 +1676,12 @@ msgstr "Nem találom a lemezt" msgid "File not found" msgstr "Nem találom a fájlt" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1882,38 +1893,38 @@ msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" msgid "Unable to connect to %s %s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "%s kulcstartó nem érhető el" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gnupg telepítve van?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2280,24 +2291,24 @@ msgstr "opcionális" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "FÃŒggőségi fa építése" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Lehetséges verziók" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "FÃŒggőség-generálás" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" @@ -2425,12 +2436,12 @@ msgstr "A(z) %s metódus nem indult el helyesen" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és ÃŒss entert" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típus nem határozható meg" @@ -2744,6 +2755,9 @@ msgstr "%s teljesen eltávolítva" msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" +#~ msgid "File date has changed %s" +#~ msgstr "A fájl dátuma megváltozott %s" + #~ msgid "Total Distinct Descriptions: " #~ msgstr "Összes kÃŒlső leírás: " diff --git a/po/it.po b/po/it.po index 2a0e621a7..46e7b0b35 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-02-14 11:41+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@ -426,115 +426,126 @@ msgstr "Nessuna selezione corrisponde" msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB era corrotto, il file è stato rinominato in %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il DB è vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La data del file è cambiata %s" +msgid "Failed to stat %s" +msgstr "Impossibile analizzare %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archivio non ha un campo control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossibile leggere la directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossibile analizzare %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errori applicati al file " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Impossibile risolvere %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Visita dell'albero fallita" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Impossibile eseguire readlink su %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Impossibile eseguire unlink su %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossibile eseguire link tra %s e %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Impossibile analizzare %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantainer è %s non %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s non ha un campo override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s non ha un campo override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -634,7 +645,7 @@ msgstr "Impossibile rinominare %s in %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" @@ -736,124 +747,124 @@ msgstr "%lu da rimuovere e %lu non aggiornati.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " fallita." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "È consigliabile eseguire `apt-get -f install' per correggere questi problemi." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato \n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Non è stato possibile autenticare alcuni pacchetti" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è terminato" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non può essere letta." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Che strano... le dimensioni non corrispondono, inviare un'email a " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario prendere %sB/%sB di archivi. \n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario prendere %sB di archivi. \n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Lo spazio libero in %s non è sufficente." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità Trivial Only ma questa non è un'operazione " "triviale" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +875,28 @@ msgstr "" "Per continuare scrivere la frase '%s' \n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Download completato e in modalità download-only" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,49 +904,49 @@ msgstr "" "Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update " "o provare l'opzione --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non è ancora supportato" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s è stato saltato, perché è già installato e l'aggiornamento non è stato " "impostato.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non è installato, quindi non è stato rimosso\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,49 +957,49 @@ msgstr "" "pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n" "o è disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non è stata trovata la release '%s' per '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non è stata trovata la versione '%s' per '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,26 +1007,26 @@ msgstr "" "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1034,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1046,7 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,121 +1056,121 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si è saltato il file già scaricato '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non è sufficente" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1168,7 +1179,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1177,32 +1188,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo nuovo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1390,19 +1401,19 @@ msgstr "Aggiornamento delle informazioni disponibili" msgid "Failed to create pipes" msgstr "Impossibile creare delle pipe" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Impossibile eseguire gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archivio corrotto" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar fallito, archivio corrotto" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo %u nell'header del tar sconosciuto, member %s" @@ -1684,12 +1695,12 @@ msgstr "Disco non trovato" msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossibile analizzare" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" @@ -1903,41 +1914,41 @@ msgstr " msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Impossibile risolvere '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: Firma corretta, ma non è stato possibile determinare il " "fingerprint della chiave?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Almeno una firma non valida è stata trovata." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " per verificare la firma (gnugp è installato?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2309,24 +2320,24 @@ msgstr "opzionale" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" @@ -2456,12 +2467,12 @@ msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2780,6 +2791,9 @@ msgstr "Impossibile rimuovere %s" msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" +#~ msgid "File date has changed %s" +#~ msgstr "La data del file è cambiata %s" + #~ msgid "Reading file list" #~ msgstr "Lettura della lista dei file in corso" diff --git a/po/ja.po b/po/ja.po index db78e7bad..84608b5d1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-01-25 20:55+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s コンパむル日時: %s %s\n" @@ -426,115 +426,126 @@ msgstr "遞択にマッチするものがありたせん" msgid "Some files are missing in the package file group `%s'" msgstr "パッケヌゞファむルグルヌプ `%s' に芋圓たらないファむルがありたす" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB が壊れおいたため、ファむル名を %s.old に倉曎したした" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB が叀いため、%s のアップグレヌドを詊みたす" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB ファむル %s を開くこずができたせん: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "ファむル %s の日付が倉曎されおいたす" +msgid "Failed to stat %s" +msgstr "%s の状態を取埗するのに倱敗したした" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "アヌカむブにコントロヌルレコヌドがありたせん" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "カヌ゜ルを取埗できたせん" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "è­Šå‘Š: ディレクトリ %s が読めたせん\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "è­Šå‘Š: %s の状態を取埗できたせん\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "゚ラヌ: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "è­Šå‘Š: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "゚ラヌ: ゚ラヌが適甚されるファむルは " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "%s の解決に倱敗したした" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "ツリヌ内での移動に倱敗したした" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s のオヌプンに倱敗したした" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " リンク %s [%s] を倖したす\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "%s のリンク読み取りに倱敗したした" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "%s のリンク解陀に倱敗したした" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s を %s にリンクするのに倱敗したした" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " リンクを倖す制限の %sB に到達したした。\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s の状態を取埗するのに倱敗したした" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "アヌカむブにパッケヌゞフィヌルドがありたせんでした" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s に override ゚ントリがありたせん\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s に override ゚ントリがありたせん\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s に override ゚ントリがありたせん\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -634,7 +645,7 @@ msgstr "%s を %s に名前倉曎できたせんでした" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "正芏衚珟の展開゚ラヌ - %s" @@ -735,121 +746,121 @@ msgstr "削陀: %lu 個、保留: %lu 個。\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケヌゞが完党にむンストヌルたたは削陀されおいたせん。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "䟝存関係を解決しおいたす ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " 倱敗したした。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "䟝存関係を蚂正できたせん" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "アップグレヌドセットを最小化できたせん" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " 完了" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "これらを盎すためには 'apt-get -f install' を実行する必芁があるかもしれたせ" "ん。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "未解決の䟝存関係がありたす。-f オプションを詊しおください。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "è­Šå‘Š: 以䞋のパッケヌゞは認蚌されおいたせん!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "認蚌の譊告は䞊曞きされたした。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "怜蚌なしにこれらのパッケヌゞをむンストヌルしたすか [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "いく぀かのパッケヌゞを認蚌できたせんでした" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで䜿甚されたした" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内郚゚ラヌ、InstallPackages が壊れたパッケヌゞで呌び出されたした!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "パッケヌゞを削陀しなければなりたせんが、削陀が無効になっおいたす。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "内郚゚ラヌ、調敎が終わっおいたせん" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "ダりンロヌドディレクトリをロックできたせん" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "゜ヌスのリストを読むこずができたせん。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっず、サむズがマッチしたせん。apt@packages.debian.org にメヌルしおください" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB äž­ %1$sB のアヌカむブを取埗する必芁がありたす。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアヌカむブを取埗する必芁がありたす。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "展開埌に远加で %sB のディスク容量が消費されたす。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "展開埌に %sB のディスク容量が解攟されたす。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を枬定できたせん" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペヌスがありたせん。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されたしたが、これは簡単な操䜜ではありたせん。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -860,28 +871,28 @@ msgstr "" "続行するには、'%s' ずいうフレヌズをタむプしおください。\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "䞭断したした。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "続行したすか [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取埗に倱敗したした %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "いく぀かのファむルの取埗に倱敗したした" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "ダりンロヌドオンリヌモヌドでパッケヌゞのダりンロヌドが完了したした" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -889,49 +900,49 @@ msgstr "" "いく぀かのアヌカむブが取埗できたせん。apt-get update を実行するか --fix-" "missing オプションを付けお詊しおみおください。" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ずメディア亀換は珟圚同時にはサポヌトされおいたせん" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "足りないパッケヌゞを盎すこずができたせん。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "むンストヌルを䞭断したす。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "泚意、%2$s の代わりに %1$s を遞択したす\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにむンストヌルされおおりアップグレヌドも蚭定されおいないため、%s をスキッ" "プしたす。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "パッケヌゞ %s はむンストヌルされおいないため、削陀はできたせん\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以䞋のパッケヌゞで提䟛されおいる仮想パッケヌゞです:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [むンストヌル枈み]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "むンストヌルするパッケヌゞを明瀺的に遞択する必芁がありたす。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -942,49 +953,49 @@ msgstr "" "おそらく、そのパッケヌゞが芋぀からないか、もう叀くなっおいるか、\n" "あるいは別の゜ヌスからのみしか利甚できないずいう状況が考えられたす\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "しかし、以䞋のパッケヌゞで眮き換えられおいたす:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "パッケヌゞ %s にはむンストヌル候補がありたせん" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダりンロヌドできないため、%s の再むンストヌルは䞍可胜です。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バヌゞョンです。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリヌス '%1$s' が芋぀かりたせんでした" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバヌゞョン '%1$s' が芋぀かりたせんでした" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバヌゞョン %1$s (%2$s) を遞択したした\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "update コマンドは匕数をずりたせん" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできたせん" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -992,27 +1003,27 @@ msgstr "" "いく぀かのむンデックスファむルのダりンロヌドに倱敗したした。これらは無芖され" "るか、叀いものが代わりに䜿われたす。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "内郚゚ラヌ、AllUpgrade が䜕かを砎壊したした" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "パッケヌゞ %s が芋぀かりたせん" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "泚意: 正芏衚珟 '%2$s' に察しお %1$s を遞択したした\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以䞋の問題を解決するために 'apt-get -f install' を実行する必芁があるかもしれ" "たせん:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1031,7 @@ msgstr "" "未解決の䟝存関係です。'apt-get -f install' を実行しおみおください (たたは解法" "を明瀺しおください)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1032,7 +1043,7 @@ msgstr "" "であれば) 必芁なパッケヌゞがただ䜜成されおいなかったり Incoming から移\n" "動されおいないこずが考えられたす。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,122 +1053,122 @@ msgstr "" "可胜性が高いです。そのため、このパッケヌゞぞのバグレポヌトを送っおくだ\n" "さい。" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "以䞋の情報がこの問題を解決するために圹立぀かもしれたせん:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "壊れたパッケヌゞ" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "以䞋の特別パッケヌゞがむンストヌルされたす:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "提案パッケヌゞ:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "掚奚パッケヌゞ:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "アップグレヌドパッケヌゞを怜出しおいたす ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "倱敗" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "内郚゚ラヌ、問題リゟルバが䜕かを砎壊したした" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "゜ヌスを取埗するには少なくずもひず぀のパッケヌゞ名を指定する必芁がありたす" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "%s の゜ヌスパッケヌゞが芋぀かりたせん" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダりンロヌドされたファむル '%s' をスキップしたす\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペヌスがありたせん" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB äž­ %1$sB の゜ヌスアヌカむブを取埗する必芁がありたす。\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB の゜ヌスアヌカむブを取埗する必芁がありたす。\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "゜ヌス %s を取埗\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "いく぀かのアヌカむブの取埗に倱敗したした。" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開された゜ヌスがあるため、展開をスキップしたす\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が倱敗したした。\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケヌゞがむンストヌルされおいるこずを確認しおください。\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が倱敗したした。\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "子プロセスが倱敗したした" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド䟝存関係をチェックするパッケヌゞを少なくずも 1 ぀指定する必芁がありたす" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド䟝存情報を取埗できたせん" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド䟝存情報が指定されおいたせん。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1166,7 +1177,7 @@ msgstr "" "パッケヌゞ %3$s が芋぀からないため、%2$s に察する %1$s の䟝存関係を満たすこず" "ができたせん" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,32 +1186,32 @@ msgstr "" "入手可胜な %3$s はいずれもバヌゞョンに぀いおの芁求を満たせないため、%2$s に察" "する %1$s の䟝存関係を満たすこずができたせん" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の䟝存関係 %1$s を満たすこずができたせん: むンストヌルされた %3$s パッ" "ケヌゞは新しすぎたす" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の䟝存関係 %1$s を満たすこずができたせん: %3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド䟝存関係を満たすこずができたせんでした。" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "ビルド䟝存関係の凊理に倱敗したした" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "サポヌトされおいるモゞュヌル:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,19 +1393,19 @@ msgstr "入手可胜情報をマヌゞしおいたす" msgid "Failed to create pipes" msgstr "パむプの生成に倱敗したした" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "gzip の実行に倱敗したした" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "壊れたアヌカむブ" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサムが倱敗したした。アヌカむブが壊れおいたす" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタむプ %u、メンバヌ %s" @@ -1677,12 +1688,12 @@ msgstr "ディスクが芋぀かりたせん。" msgid "File not found" msgstr "ファむルが芋぀かりたせん" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "状態の取埗に倱敗したした" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "倉曎時刻の蚭定に倱敗したした" @@ -1894,38 +1905,38 @@ msgstr "'%s:%s' (%i) の解決䞭に問題が起こりたした" msgid "Unable to connect to %s %s:" msgstr "%s %s ぞ接続できたせん:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "'%s' を解決できたせんでした" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options の匕数リストが長すぎたす。終了しおいたす。" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内郚゚ラヌ: 正しい眲名ですが、鍵指王を確定できたせん?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "少なくずも 1 ぀の䞍正な眲名が発芋されたした。" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " 眲名の怜蚌 (gnupg はむンストヌルされおいたすか?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "gpgv の実行䞭に未知の゚ラヌが発生" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "以䞋の眲名が無効です:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2289,24 +2300,24 @@ msgstr "任意" msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "䟝存関係ツリヌを䜜成しおいたす" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "候補バヌゞョン" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "䟝存関係の生成" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "パッケヌゞファむル %s を解釈するこずができたせん (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケヌゞファむル %s を解釈するこずができたせん (2)" @@ -2436,12 +2447,12 @@ msgstr "" "'%s' ずラベルの付いたディスクをドラむブ '%s' に入れお enter を抌しおくださ" "い。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケヌゞングシステム '%s' はサポヌトされおいたせん" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケヌゞシステムタむプを特定できたせん" @@ -2760,6 +2771,9 @@ msgstr "%s の削陀に倱敗したした" msgid "Connection closed prematurely" msgstr "途䞭で接続がクロヌズされたした" +#~ msgid "File date has changed %s" +#~ msgstr "ファむル %s の日付が倉曎されおいたす" + #~ msgid "Reading file list" #~ msgstr "ファむルリストを読み蟌んでいたす" diff --git a/po/ko.po b/po/ko.po index 4617fc2ac..c113d282f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-07-20 00:28+0900\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" @@ -146,7 +146,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컎파음 시각 %s %s\n" @@ -421,117 +421,128 @@ msgstr "맞는 ꟞러믞가 없습니닀" msgid "Some files are missing in the package file group `%s'" msgstr "`%s' ꟞러믞 파음 귞룹에 몇몇 파음읎 빠졌습니닀" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니닀. 파음 읎늄을 %s.old로 바꿉니닀" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 였래되었습니닀. %s의 업귞레읎드륌 시도합니닀" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파음, %s 파음을 ì—Ž 수 없습니닀: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "%s 파음의 마지막 수정 시각읎 바뀌엇습니닀" +msgid "Failed to stat %s" +msgstr "%s의 정볎륌 읜는 데 싀팚했습니닀" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "아칎읎람에 컚튞례 Ʞ록읎 없습니닀" # FIXME: 왠 컀서?? -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "컀서륌 가젞올 수 없습니닀" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "겜고: %s 디렉토늬륌 읜을 수 없습니닀\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "겜고: %s의 정볎륌 읜을 수 없습니닀\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "였류: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "겜고: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "였류: 닀음 파음에 적용하는 데 였류가 발생했습니닀: " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "%s의 겜로륌 알아낎는 데 싀팚했습니닀" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "튞늬에서 읎동읎 싀팚했습니닀" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s 파음을 여는 데 싀팚했습니닀" # FIXME: ?? -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애Ʞ\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "%s 파음에 readlink하는 데 싀팚했습니닀" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "%s 파음을 지우는 데 싀팚했습니닀" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s 파음을 %s(윌)로 링크하는 데 싀팚했습니닀" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바읎튞에 도달했습니닀.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s의 정볎륌 읜는 데 싀팚했습니닀" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "아칎읎람에 ꟞러믞 필드가 없습니닀" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목읎 없습니닀\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ꎀ늬자가 %s입니닀 (%s 아님)\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s에는 override 항목읎 없습니닀\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s에는 override 항목읎 없습니닀\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -631,7 +642,7 @@ msgstr "%s 파음의 읎늄을 %s(윌)로 바꟞는 데 싀팚했습니닀" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컎파음 였류 - %s" @@ -732,124 +743,124 @@ msgstr "%lu개 지우Ʞ 및 %lu개 업귞레읎드 안 핹.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu개륌 완전히 섀치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "의졎성을 바로잡는 쀑입니닀..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " 싀팚." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "의졎성을 바로잡을 수 없습니닀" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "업귞레읎드 집합을 최소화할 수 없습니닀" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "읎 상황을 바로잡윌렀멎 `apt-get -f install'을 싀행핎알 할 수도 있습니닀." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "의졎성읎 맞지 않습니닀. -f 옵션을 사용핎 볎십시였." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "겜고: 닀음 ꟞러믞륌 읞슝할 수 없습니닀!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "읞슝 겜고륌 묎시합니닀.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "확읞하지 않고 ꟞러믞륌 섀치하시겠습니까 [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "읞슝할 수 없는 ꟞러믞가 있습니닀" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "묞제가 발생했고 -y 옵션읎 --force-yes 옵션 없읎 사용되었습니닀" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "낎부 였류. 망가진 ꟞러믞에서 InstallPackages륌 혞출했습니닀!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "꟞러믞륌 지워알 하지만 지우Ʞ가 ꞈ지되얎 있습니닀." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "낎부 였류. 순서변겜작업읎 끝나지 않았습니닀" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "낎렀받Ʞ 디렉토늬륌 잠Ꞁ 수 없습니닀" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소슀 목록을 읜을 수 없습니닀." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "읎상하게도 크Ʞ가 서로 닀늅니닀. apt@packages.debian.org로 읎메음을 볎낎죌십" "시였." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바읎튞/%s바읎튞 아칎읎람륌 받아알 합니닀.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바읎튞 아칎읎람륌 받아알 합니닀.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀멎 %s바읎튞의 디슀크 공간을 더 사용하게 됩니닀.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀멎 %s바읎튞의 디슀크 공간읎 비워집니닀.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크Ʞ륌 파악할 수 없습니닀" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간읎 없습니닀." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 읎 작업은 사소한 작업읎 " "아닙니닀." # 입력을 받아알 한닀. 한Ꞁ 입력을 못 할 수 있윌므로 원묞 귞대로 사용. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -860,28 +871,28 @@ msgstr "" "계속하시렀멎 닀음 묞구륌 입력하십시였: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "쀑닚." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파음을 받는 데 싀팚했습니닀 %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "음부 파음을 받는 데 싀팚했습니닀" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "낎렀받Ʞ륌 마쳀고 낎렀받Ʞ 전용 몚드입니닀" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -889,48 +900,48 @@ msgstr "" "아칎읎람륌 받을 수 없습니닀. 아마도 apt-get update륌 싀행핎알 하거나 --fix-" "missing 옵션을 쀘서 싀행핎알 할 것입니닀." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션곌 동시에 믞디얎 바꟞Ʞ는 현재 지원하지 않습니닀" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "빠진 ꟞러믞륌 바로잡을 수 없습니닀." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "섀치륌 쀑닚합니닀." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "죌의, %2$s 대신에 %1$s ꟞러믞륌 선택합니닀\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s ꟞러믞륌 걎너 뜁니닀. 읎믞 섀치되얎 있고 업귞레읎드륌 하지 않습니닀.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s ꟞러믞륌 섀치하지 않았윌므로, 지우지 않습니닀\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s ꟞러믞는 닀음 ꟞러믞가 제공하는 가상 ꟞러믞입니닀:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [섀치핚]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "섀치하렀멎 분명하게 하나륌 선택핎알 합니닀." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -941,49 +952,49 @@ msgstr "" "핎당 ꟞러믞가 누띜되었거나 지워졌닀는 뜻입니닀. 아니멎 또 닀륞 곳에서\n" "꟞러믞륌 받아와알 하는 겜우음 수도 있습니닀.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "하지만 닀음 ꟞러믞가 대첎합니닀:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "%s ꟞러믞는 섀치할 수 있는 후볎가 없습니닀" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s ꟞러믞륌 닀시 섀치하는 걎 불가능합니닀. ë‚Žë € 받을 수 없습니닀.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ꟞러믞는 읎믞 최신 버전입니닀.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s ꟞러믞의 '%1$s' 늎늬슈륌 찟을 수 없습니닀" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s ꟞러믞의 '%1$s' 버전을 찟을 수 없습니닀" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s ꟞러믞의 %1$s (%2$s) 버전을 선택합니닀\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "update 명령은 읞수륌 받지 않습니닀" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "목록 디렉토늬륌 잠Ꞁ 수 없습니닀" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -991,26 +1002,26 @@ msgstr "" "음부 읞덱슀 파음을 낎렀받는 데 싀팚했습니닀. 핎당 파음을 묎시하거나 곌거의 버" "전을 대신 사용합니닀." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "낎부 였류, AllUpgrade때묞에 망가졌습니닀" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "%s ꟞러믞륌 찟을 수 없습니닀" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "죌의, 정규식 '%2$s'에 대하여 %1$s을(륌) 선택합니닀\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "닀음을 바로잡윌렀멎 `apt-get -f install'을 싀행핎 볎십시였:" # FIXME: specify a solution? 묎슚 솔룚션? -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1018,7 +1029,7 @@ msgstr "" "의졎성읎 맞지 않습니닀. ꟞러믞 없읎 'apt-get -f install'을 시도핎 볎십시였 " "(아니멎 í•Žê²° 방법을 지정하십시였)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1029,7 +1040,7 @@ msgstr "" "불안정 배포판을 사용핎서 음부 필요한 ꟞러믞륌 아직 만듀지 않았거나,\n" "아직 Incoming에서 나였지 않은 겜우음 수도 있습니닀." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1038,119 +1049,119 @@ msgstr "" "한 가지 작업만을 요청하셚윌므로, 아마도 읎 ꟞러믞륌 섀치할 수\n" "없는 겜우음 것읎고 읎 ꟞러믞에 버귞 볎고서륌 제출핎알 합니닀." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "읎 상황을 핎결하는 데 닀음 정볎가 도움읎 될 수도 있습니닀:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "망가진 ꟞러믞" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "닀음 ꟞러믞륌 더 섀치할 것입니닀:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "제안하는 ꟞러믞:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "추천하는 ꟞러믞:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "업귞레읎드륌 계산하는 쀑입니닀... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "싀팚" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "낎부 였류, 묞제 í•Žê²° 프로귞랚읎 사고쳀습니닀" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "핎당되는 소슀 ꟞러믞륌 가젞올 ꟞러믞륌 최소한 하나 지정핎알 합니닀" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소슀 ꟞러믞륌 찟을 수 없습니닀" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "읎믞 닀욎로드 받은 파음 '%s'은(는) 닀시 받지 않고 걎너 뜁니닀.\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간읎 없습니닀" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소슀 아칎읎람륌 %s바읎튞/%s바읎튞 받아알 합니닀.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소슀 아칎읎람륌 %s바읎튞 받아알 합니닀.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "%s 소슀륌 가젞옵니닀\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "음부 아칎읎람륌 가젞였는 데 싀팚했습니닀." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 읎믞 풀렀 있는 소슀의 압축을 풀지 않고 걎너 뜁니닀.\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀Ʞ 명령 '%s' 싀팚.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' ꟞러믞가 섀치되었는지륌 확읞핎죌십시였.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 싀팚.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "하위 프로섞슀가 싀팚했습니닀" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "핎당되는 빌드 의졎성을 검사할 ꟞러믞륌 최소한 하나 지정핎알 합니닀" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의졎성 정볎륌 가젞올 수 없습니닀" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s ꟞러믞에 빌드 의졎성읎 없습니닀.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1159,7 +1170,7 @@ msgstr "" "%2$s에 대한 %1$s 의졎성을 만족시킬 수 없습니닀. %3$s ꟞러믞륌 찟을 수 없습니" "ë‹€" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,32 +1179,32 @@ msgstr "" "%2$s에 대한 %1$s 의졎성을 만족시킬 수 없습니닀. %3$s ꟞러믞의 사용 가능한 버" "전 쀑에서는 읎 버전 요구사항을 만족시킬 수 없습니닀" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의졎성을 만족시킀는 데 싀팚했습니닀: 섀치한 %3$s ꟞러믞가 너" "묎 최귌 버전입니닀" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의졎성을 만족시킀는 데 싀팚했습니닀: %3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의졎성을 만족시킀지 못했습니닀." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "빌드 의졎성을 처늬하는 데 싀팚했습니닀" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "지원하는 몚듈:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1373,19 +1384,19 @@ msgstr "읎용 가능 ꟞러믞 정볎륌 합칩니닀" msgid "Failed to create pipes" msgstr "파읎프 만듀Ʞ가 싀팚했습니닀" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "gzip 싀행읎 싀팚했습니닀" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "아칎읎람가 손상되었습니닀" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "tar 첎크섬 싀팚, 아칎읎람가 손상되었습니닀" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헀더 타입 %u, 멀버 %s" @@ -1664,12 +1675,12 @@ msgstr "디슀크가 없습니닀" msgid "File not found" msgstr "파음읎 없습니닀" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "파음 정볎륌 읜는 데 싀팚했습니닀" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "파음 변겜 시각을 섀정하는 데 싀팚했습니닀" @@ -1881,38 +1892,38 @@ msgstr "'%s:%s'의 죌소륌 알아낎는 데 묎얞가 읎상한 음읎 발생 msgid "Unable to connect to %s %s:" msgstr "%s %s에 연결할 수 없습니닀:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "킀링에 접귌할 수 없습니닀: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options의 읞자 목록읎 너묎 깁니닀. 종료하는 쀑." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "낎부 였류: 서명은 올바륎지만 í‚€ 지묞을 확읞할 수 없습니닀!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 읎상의 서명읎 잘못되었습니닀." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "서명을 읞슝하Ʞ 위한 '%s'륌 싀행할 수 없습니닀(gnupg가 섀치됐나요?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "gpgv 싀행 도쀑 알 수 없는 였류 발생" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "닀음 서명읎 올바륎지 않습니닀:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2276,24 +2287,24 @@ msgstr "옵션" msgid "extra" msgstr "별도" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "의졎성 튞늬륌 만드는 쀑입니닀" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "후볎 버전" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "의졎성 만듀Ʞ" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "꟞러믞 파음 %s 파음을 파싱할 수 없습니닀 (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "꟞러믞 파음 %s 파음을 파싱할 수 없습니닀 (2)" @@ -2421,12 +2432,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%2$s' 드띌읎람에 '%1$s'로 표Ʞ된 디슀크륌 삜입하고 엔터륌 눌러죌십시였." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꟞러믞 시슀템 '%s'을(륌) 지원하지 않습니닀" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "올바륞 ꟞러믞 시슀템 타입을 알아낌 수 없습니닀" @@ -2734,6 +2745,9 @@ msgstr "%s을(륌) 완전히 지웠습니닀" msgid "Connection closed prematurely" msgstr "연결읎 너묎 빚늬 끊얎졌습니닀" +#~ msgid "File date has changed %s" +#~ msgstr "%s 파음의 마지막 수정 시각읎 바뀌엇습니닀" + #~ msgid "Reading file list" #~ msgstr "파음 목록을 읜는 쀑" diff --git a/po/nb.po b/po/nb.po index 58b3c024c..b6b04f973 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@ -445,115 +445,126 @@ msgstr "Ingen utvalg passet" msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsøker å oppgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke å åpne Databasefila %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fildatoen er endret %s" +msgid "Failed to stat %s" +msgstr "Klarte ikke å få statusen på %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikke å finne en peker" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke å lese katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke å få statusen på %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F:" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A:" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke å slå opp %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Klarte ikke å finne fram i treet" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke å lese lenken %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke å oppheve lenken %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke å lenke %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %s B er nådd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Klarte ikke å få statusen på %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen overstyringsoppføring\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen overstyringsoppføring\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -653,7 +664,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -755,120 +766,120 @@ msgstr "%lu msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Utført" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Det oppsto en intern feil når avledningen ble lagt til" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -879,28 +890,28 @@ msgstr "" "For å fortsette, skriv: «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -908,48 +919,48 @@ msgstr "" "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Du må velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,49 +971,49 @@ msgstr "" "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Følgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Kan ikke låse listemappa" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,25 +1021,25 @@ msgstr "" "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1047,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1048,7 +1059,7 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,127 +1069,127 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1187,32 +1198,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,19 +1405,19 @@ msgstr "Fletter tilgjengelig informasjon" msgid "Failed to create pipes" msgstr "Klarte ikke å opprette rør" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikke å kjøre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" @@ -1691,12 +1702,12 @@ msgstr "Fant ikke fila" msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -1908,39 +1919,39 @@ msgstr "Noe galt skjedde ved oppslag av msgid "Unable to connect to %s %s:" msgstr "Klarte ikke å koble til %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Klarte ikke å slå opp «%s»" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Følgende ekstra pakker vil bli installert." -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2304,24 +2315,24 @@ msgstr "valgfri" msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" @@ -2451,12 +2462,12 @@ msgstr "" " «%s»\n" "i «%s» og trykk «Enter»\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@ -2765,6 +2776,9 @@ msgstr "Klarte ikke msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "File date has changed %s" +#~ msgstr "Fildatoen er endret %s" + #~ msgid "Reading file list" #~ msgstr "Leser filliste" diff --git a/po/nl.po b/po/nl.po index 5d2632efa..6798bed47 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@ -435,115 +435,126 @@ msgstr "Er waren geen passende selecties" msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering %s wordt geprobeerd" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Bestandsdatum is veranderd %s" +msgid "Failed to stat %s" +msgstr "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Waarde van link %s weergeven is mislukt" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Status opvragen van %s is mislukt" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s heeft geen voorrangsingang\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s heeft geen voorrangsingang\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -643,7 +654,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -745,120 +756,120 @@ msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Vereisten worden verbeterd..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet verbeteren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Interne fout bij het toevoegen van een omleiding" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft niet voldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +880,28 @@ msgstr "" "Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,49 +909,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Geïnstalleerd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "U dient er één expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -951,50 +962,50 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,27 +1013,27 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1041,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1041,7 +1052,7 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1051,124 +1062,124 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1177,7 +1188,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1186,32 +1197,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1402,19 +1413,19 @@ msgstr "De beschikbare informatie wordt samengevoegd" msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" @@ -1699,12 +1710,12 @@ msgstr "Bestand niet gevonden" msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Status opvragen is mislukt" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1916,39 +1927,39 @@ msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Kon '%s' niet vinden" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2322,24 +2333,24 @@ msgstr "optioneel" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" @@ -2471,12 +2482,12 @@ msgstr "" " '%s'\n" "in het station '%s' te plaatsen en op 'enter' te drukken\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2793,6 +2804,9 @@ msgstr "Verwijderen van %s is mislukt" msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" +#~ msgid "File date has changed %s" +#~ msgstr "Bestandsdatum is veranderd %s" + #~ msgid "Reading file list" #~ msgstr "Bestandslijst wordt ingelezen" diff --git a/po/nn.po b/po/nn.po index 56aa980ee..113810dd5 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@ -429,115 +429,126 @@ msgstr "Ingen utval passa" msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forsøkjer å oppgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fildatoen er endra %s" +msgid "Failed to stat %s" +msgstr "Klarte ikkje få status til %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikkje få peikar" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Å: Klarte ikkje lesa katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "Å: Klarte ikkje få status til %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "Å: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje slå opp %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Treklatring mislukkast" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %sB er nådd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Klarte ikkje få status til %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppføring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s har inga overstyringsoppføring\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har inga overstyringsoppføring\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -637,7 +648,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -739,121 +750,121 @@ msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Rettar på krav ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta på krav" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar må fjernast, men fjerning er slått av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må henta %sB/%sB med arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må henta %sB med arkiv.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +875,28 @@ msgstr "" "For å halda fram, må du skriva nøyaktig «%s».\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,49 +904,49 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " "«--fix-missing»." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert frå før og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Du må velja ein som skal installerast." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,49 +957,49 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n" "eller er berre tilgjengeleg frå ei anna kjelde\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Dei følgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert frå før.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgåva «%s» av «%s»" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen «%s» av «%s»" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Klarte ikkje låsa listekatalogen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,26 +1007,26 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1034,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1046,7 @@ msgstr "" "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i «Incoming»." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,127 +1056,127 @@ msgstr "" "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Øydelagde pakkar" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Tilrådde pakkar" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,31 +1185,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Støtta modular:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1378,19 +1389,19 @@ msgstr "Flettar informasjon om tilgjengelege pakkar" msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta røyr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikkje køyra gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Øydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" @@ -1674,12 +1685,12 @@ msgstr "Fann ikkje fila" msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikkje få status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1891,39 +1902,39 @@ msgstr "Det hende noko dumt ved oppslag av msgid "Unable to connect to %s %s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Klarte ikkje slå opp «%s»" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2287,24 +2298,24 @@ msgstr "valfri" msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" @@ -2435,12 +2446,12 @@ msgstr "" " «%s»\n" "i stasjonen «%s» og trykk Enter.\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» er ikkje støtta" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@ -2748,6 +2759,9 @@ msgstr "Klarte ikkje fjerna %s" msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#~ msgid "File date has changed %s" +#~ msgstr "Fildatoen er endra %s" + #~ msgid "Reading file list" #~ msgstr "Les filliste" diff --git a/po/pl.po b/po/pl.po index 8be562ac6..34aa5a460 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@ -427,115 +427,126 @@ msgstr "Nie dopasowano msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plików w grupie plików pakietów `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza by³a uszkodzona, plik zosta³ przeniesiony do %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarza³a, próbujê zaktualizowaæ %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nie uda³o siê otworzyæ pliku DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data pliku uleg³a zmianie %s" +msgid "Failed to stat %s" +msgstr "Nie uda³o siê wykonaæ operacji stat na %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nie uda³o siê pobraæ kursora" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie uda³o siê odczytaæ katalogu %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nie mo¿na wykonaæ operacji stat na %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: B³êdy odnosz± siê do pliku " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Nie uda³o siê przet³umaczyæ nazwy %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Przej¶cie po drzewie nie powiod³o siê" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Nie uda³o siê otworzyæ %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Od³±czenie %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Nie uda³o siê odczytaæ dowi±zania %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Nie uda³o siê usun±æ %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie uda³o siê dowi±zaæ %s do %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osi±gniêto ograniczenie od³±czania %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Nie uda³o siê wykonaæ operacji stat na %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiwum nie posiada³o pola pakietu" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nie posiada wpisu w pliku override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nie posiada wpisu w pliku override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -635,7 +646,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "B³±d kompilacji wyra¿enia regularnego - %s" @@ -736,118 +747,118 @@ msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Naprawianie zale¿no¶ci..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " nie uda³o siê." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Nie uda³o siê naprawiæ zale¿no¶ci" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Ostrze¿enie uwierzytelniania zignorowano.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "By³y problemy, a u¿yto -y bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "B³±d wewnêtrzny, InstallPackages u¿yto z zepsutymi pakietami!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "B³±d wewnêtrzny, sortowanie niezakoñczone" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie uda³o siê odczytaæ list Œróde³." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Dziwne.. rozmiary siê nie zgadzaj±, zg³o¶ pod apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie uda³o siê ustaliæ ilo¶ci wolnego miejsca w %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Tak, rób jak mówiê!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -858,28 +869,28 @@ msgstr "" "Aby kontynuowaæ wpisz zdanie '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowaæ [T/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie uda³o siê pobraæ %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Nie uda³o siê pobraæ niektórych plików" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Ukoñczono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -887,48 +898,48 @@ msgstr "" "Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update " "lub u¿yæ opcji --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -939,50 +950,50 @@ msgstr "" "Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n" "pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych Œróde³.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju¿ w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersjê %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga ¿adnych argumentów" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Nie uda³o siê zablokowaæ katalogu list" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -990,25 +1001,25 @@ msgstr "" "Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub " "zosta³a u¿yta ich starsza wersja." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Nie uda³o siê odnaleŒæ pakietu %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1016,7 +1027,7 @@ msgstr "" "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " "podaj rozwi±zanie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1028,7 +1039,7 @@ msgstr "" "w której niektóre pakiety nie zosta³y jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodz±ce\")." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1038,124 +1049,124 @@ msgstr "" "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" "b³±d." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pakiety s± b³êdne" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie uda³o siê" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pobrane " "Œród³a" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie uda³o siê odnaleŒæ Œród³a dla pakietu %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie ju¿ pobranego pliku '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów Œróde³.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów Œróde³.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz Œród³o %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Nie uda³o siê pobraæ niektórych archiwów." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju¿ rozpakowanego Œród³a w %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "SprawdŒ czy pakiet 'dpkg-dev' jest zainstalowany.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiod³o.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Proces potomny zawiód³" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1175,7 @@ msgstr "" "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1184,32 @@ msgstr "" "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Obs³ugiwane modu³y:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,19 +1393,19 @@ msgstr " msgid "Failed to create pipes" msgstr "Nie uda³o siê utworzyæ potoków" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Nie uda³o uruchomiæ programu gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nag³ówka TAR %u, sk³adnik %s" @@ -1674,12 +1685,12 @@ msgstr "Nie odnaleziono dysku." msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nie uda³o siê wykonaæ operacji stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nie uda³o siê ustawiæ czasu modyfikacji" @@ -1892,40 +1903,40 @@ msgstr "Co msgid "Unable to connect to %s %s:" msgstr "Nie uda³o siê po³±czyæ z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt d³uga. Wychodzimy." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "B³±d wewnêtrzny: Prawid³owa sygnatura, ale nie nie uda³o siê ustaliæ " "jejodcisku?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jedn± nieprawid³ow± sygnaturê." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " by zweryfikowaæ sygnaturê (czy gnupg jest zainstalowane?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Nieznany b³±d podczas uruchamiania gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Nastêpuj±ce sygnatury by³y b³êdne:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2292,24 +2303,24 @@ msgstr "opcjonalny" msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Budowanie drzewa zale¿no¶ci" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandyduj±ce wersje" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generowanie zale¿no¶ci" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)" @@ -2437,12 +2448,12 @@ msgstr "Metoda %s nie uruchomi msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "W³ó¿ do napêdu '%s' dysk o nazwie: '%s' i naci¶nij enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów '%s' nie jest obs³ugiwany" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów" @@ -2755,6 +2766,9 @@ msgstr "Nie uda msgid "Connection closed prematurely" msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie" +#~ msgid "File date has changed %s" +#~ msgstr "Data pliku uleg³a zmianie %s" + #~ msgid "Reading file list" #~ msgstr "Czytanie listy plików" diff --git a/po/pt.po b/po/pt.po index f7b1cb806..84be545a3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Rui Az. \n" "Language-Team: Portuguese \n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -424,115 +424,126 @@ msgstr "Nenhuma selecção coincidiu" msgid "Some files are missing in the package file group `%s'" msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB é antiga, tentando uma actualização %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data do ficheiro mudou %s" +msgid "Failed to stat %s" +msgstr "Falha ao executar stat %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo não tem registro de controle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Erros aplicam-se ao ficheiro " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Falhou ao abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Falhou ao executar readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Falhou ao executar unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ao ligar %s a %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Falha ao executar stat %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arquivo não possuía campo pacote" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s não possui entrada override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s não possui entrada override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -632,7 +643,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -733,120 +744,120 @@ msgstr "%lu a remover e %lu não actualizados.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pÃŽde ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -857,28 +868,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -886,47 +897,47 @@ msgstr "" "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abortando a Instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -937,51 +948,51 @@ msgstr "" "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -989,25 +1000,25 @@ msgstr "" "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1026,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1027,7 +1038,7 @@ msgstr "" "distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1038,123 +1049,123 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1163,7 +1174,7 @@ msgstr "" "a dependência de %s por %s não pÃŽde ser satisfeita porque o pacote %s não " "pÃŽde ser encontrado" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1172,32 +1183,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,19 +1393,19 @@ msgstr "Juntando informação Disponível" msgid "Failed to create pipes" msgstr "Falha ao criar pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Falha ao executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -1674,12 +1685,12 @@ msgstr "Disco não encontrado" msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao executar stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1891,41 +1902,41 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Impossível ligar a %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " para verificar assinatura (gnupg instalado?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas estavam inválidas:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2293,24 +2304,24 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Geração de Dependência" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível o parse ao ficheiro de pacote %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" @@ -2440,12 +2451,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@ -2767,6 +2778,9 @@ msgstr "Falha ao remover %s" msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#~ msgid "File date has changed %s" +#~ msgstr "Data do ficheiro mudou %s" + #~ msgid "Reading file list" #~ msgstr "Lendo Lista de Ficheiros" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6a53d25e2..eb1182789 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-02-11 17:57-0200\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -427,115 +427,126 @@ msgstr "Nenhuma sele msgid "Some files are missing in the package file group `%s'" msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, arquivo renomeado para %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB é antigo, tentando atualizar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossível abrir arquivo DB %s : %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data do arquivo mudou %s" +msgid "Failed to stat %s" +msgstr "Falha ao checar %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossível ler o diretório %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossível checar %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Erros aplicam ao arquivo " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Falha ao percorrer a árvore" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Falha ao abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Falha ao executar readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Falha ao executar unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falha ao ligar %s a %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Falha ao checar %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s não possui entrada override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s não possui entrada override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -635,7 +646,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -737,119 +748,119 @@ msgstr "%lu a serem removidos e %lu n msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Pronto" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO : Os pacotes a seguir não podem ser autenticados !" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação sobrescrito.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [s/N] ? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Que estranho .. Os tamanhos não batem, informe apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É preciso fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de desempacotamento, %sB adicionais de espaço em disco serão usados.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Triviais Apenas especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -860,28 +871,28 @@ msgstr "" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -889,47 +900,47 @@ msgstr "" "Impossível pegar alguns arquivos, talvez rodar apt-get update ou tentar com " "--fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltosos." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abortando Instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual provido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Você deve selecionar um explicitamente para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -940,51 +951,51 @@ msgstr "" "Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -992,25 +1003,25 @@ msgstr "" "Alguns arquivos de índice falharam no download, eles foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1018,7 +1029,7 @@ msgstr "" "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1030,7 +1041,7 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1040,121 +1051,121 @@ msgstr "" "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calculando Atualização... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitindo arquivo já obtido '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote dpkg-dev está instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1163,7 +1174,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1172,32 +1183,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência %s para %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1381,19 +1392,19 @@ msgstr "Mesclando informa msgid "Failed to create pipes" msgstr "Falha ao criar pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Falha ao executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -1675,12 +1686,12 @@ msgstr "Disco n msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao checar" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1892,41 +1903,41 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saíndo." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno : Assintura boa, mas não foi possível determinar a impressão " "digital da chave ?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " ao verificar assinatura (o gnupg está instalado ?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas foram inválidas :\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2294,24 +2305,24 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Geração de Dependência" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível analizar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analizar arquivo de pacote %s (2)" @@ -2441,12 +2452,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." @@ -2768,6 +2779,9 @@ msgstr "Falha ao remover %s" msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#~ msgid "File date has changed %s" +#~ msgstr "Data do arquivo mudou %s" + #~ msgid "Reading file list" #~ msgstr "Lendo Listagem de Pacotes" diff --git a/po/ro.po b/po/ro.po index 0222214ae..789b54247 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-06-25 12:58+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@ -433,115 +433,126 @@ msgstr "Nu s-a potrivit nici o selecÅ£ie" msgid "Some files are missing in the package file group `%s'" msgstr "Unele fişiere lipsesc din grupul fişierului pachet '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB a fost corupt, fişierul a fost redenumit %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nu pot deschide fişierul DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data fişierului a fost modificată %s" +msgid "Failed to stat %s" +msgstr "Eşuare în determinarea stării %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nu pot obÅ£ine un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Nu pot citi directorul %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Nu pot determina starea %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Erori la fişierul " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Eşuare în a rezolva %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Eşuare în parcurgerea arborelui" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Eşuare la deschiderea %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dezlegare %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Eşuare la citirea legăturii %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Eşuare în desfacerea legăturii %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Eşuare în legarea %s de %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Eşuare în determinarea stării %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nu are intrare de înlocuire\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nu are intrare de înlocuire\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -641,7 +652,7 @@ msgstr "Eşuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -742,120 +753,120 @@ msgstr "%lu de şters şi %lu neînnoite.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Corectez dependenÅ£ele..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " eşuare." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenÅ£ele" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Nu pot micşora mulÅ£imea pachetelor de înnoire" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "AÅ£i putea să porniÅ£i 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i să folosiÅ£i -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "InstalaÅ£i aceste pachete fără verificare [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ce ciudat.. Dimensiunile nu se potrivesc, scrieÅ£i la apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcaÅ£i %sB/%sB de arhive.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcaÅ£i %sB de arhive.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaÅ£iu suplimentar pe disc.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaÅ£iul de pe disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spaÅ£iul disponibil în %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveÅ£i suficient spaÅ£iu în %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaÅ£iune neimportantă." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -866,28 +877,28 @@ msgstr "" "Pentru a continua tastaÅ£i fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "RenunÅ£are." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "VreÅ£i să continuaÅ£i [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +906,47 @@ msgstr "" "Nu pot aduce unele arhive, poate porniÅ£i 'apt-get update' sau încercaÅ£i cu --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeÅ£i în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,49 +957,49 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,25 +1007,25 @@ msgstr "" "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1033,7 @@ msgstr "" "DependenÅ£e neîndeplinite. ÎncercaÅ£i 'apt-get -f install' fără nici un pachet " "(sau oferiÅ£i o altă soluÅ£ie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1046,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,122 +1056,122 @@ msgstr "" " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Eşuare" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puÅ£in un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fişierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcaÅ£i %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcaÅ£i %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "VerificaÅ£i dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puÅ£in un pachet pentru a-i verifica dependenÅ£ele " "înglobate" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informaÅ£iile despre dependenÅ£ele înglobate ale lui %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenÅ£e înglobate.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1169,7 +1180,7 @@ msgstr "" "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1178,32 +1189,32 @@ msgstr "" "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenÅ£a lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenÅ£a lui %s de %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "DependenÅ£ele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenÅ£ele înglobate" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1389,19 +1400,19 @@ msgstr "Unirea informaÅ£iilor disponibile" msgid "Failed to create pipes" msgstr "Eşuare în crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Eşuare în executarea gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Eşuarea sumei de control în arhiva tar, arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tip antet TAR %u necunoscut, membru %s" @@ -1683,12 +1694,12 @@ msgstr "Disc negăsit." msgid "File not found" msgstr "Fişier negăsit" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Eşuare de determinare a stării" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" @@ -1900,41 +1911,41 @@ msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nu pot conecta la %s %s" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nu pot accesa keyring: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia " "amprentei digitale?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Cel puÅ£in o semnătură invalidă a fost întâlnită." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături au fost invalide:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2303,24 +2314,24 @@ msgstr "opÅ£ional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Se construieşte arborele de dependenţă" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Versiuni candidat" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generare dependenÅ£e" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nu pot analiza fişierul pachet %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" @@ -2449,12 +2460,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Vă rog introduceÅ£i discul numit: '%s' în unitatea '%s' şi apăsaÅ£i Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@ -2773,3 +2784,6 @@ msgstr "Şters complet %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" + +#~ msgid "File date has changed %s" +#~ msgstr "Data fişierului a fost modificată %s" diff --git a/po/ru.po b/po/ru.po index 727b7f79a..a683c0e2c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-01-21 14:55+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s Ўля %s %s скПЌпОлОрПваМ %s %s\n" @@ -440,115 +440,126 @@ msgstr "СПвпаЎеМОй Ме ПбМаружеМП" msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетПв `%s' Птсутствуют МекПтПрые файлы" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была пПврежЎеМа, файл переОЌеМПваМ в %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, пПпытка ПбМПвОть %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не уЎалПсь Пткрыть DB файл %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Дата файла %s ОзЌеМОлась" +msgid "Failed to stat %s" +msgstr "Не уЎалПсь пПлучОть атрОбуты %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архОве Мет пПля control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "НевПзЌПжМП пПлучОть курсПр" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не уЎалПсь прПчОтать каталПг %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не уЎалПсь прПчОтать атрОбуты %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: ОшОбкО ПтМПсятся к файлу '" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Не уЎалПсь прПслеЎПвать пП ссылке %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Не уЎалПсь сПвершОть ПбхПЎ Ўерева" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Не уЎалПсь Пткрыть %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Не уЎалПсь прПчесть ссылку %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Не уЎалПсь уЎалОть %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не уЎалПсь сПзЎать ссылку %s Ма %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " ПревышеМ лОЌОт в %sB в DeLink.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Не уЎалПсь пПлучОть атрОбуты %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "В архОве Мет пПля package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " Нет запОсО П переМазМачеМОО (override) Ўля %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сПпрПвПжЎает %s, а Ме %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Нет запОсО П переМазМачеМОО (override) Ўля %s\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Нет запОсО П переМазМачеМОО (override) Ўля %s\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -649,7 +660,7 @@ msgstr "Не уЎалПсь переОЌеМПвать %s в %s" msgid "Y" msgstr "ÐŽ" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "ОшОбка кПЌпОляцОО регулярМПгП выражеМОя - %s" @@ -751,126 +762,126 @@ msgstr "Ўля уЎалеМОя ПтЌечеМП %lu пакетПв, О %lu па msgid "%lu not fully installed or removed.\n" msgstr "Ме устаМПвлеМП ЎП кПМца ОлО уЎалеМП %lu пакетПв.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "ИсправлеМОе завОсОЌПстей..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " Ме уЎалПсь." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "НевПзЌПжМП скПрректОрПвать завОсОЌПстО" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "НевПзЌПжМП ЌОМОЌОзОрПвать МабПр ПбМПвлеМОй" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " ГПтПвП" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "ВПзЌПжМП, Ўля ОсправлеМОя этОх ПшОбПк вы захПтОте вПспПльзПваться `apt-get -" "f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "НеуЎПвлетвПрёММые завОсОЌПстО. ППпытайтесь ОспПльзПвать -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: СлеЎующОе пакеты МевПзЌПжМП аутеМтОфОцОрПвать!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "АутеМтОфОкацОПММПе преЎупрежЎеМОе Ме прОМятП в вМОЌаМОе.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "УстаМПвОть этО пакеты без прПверкО [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "НекПтПрые пакеты МевПзЌПжМП аутеМтОфОцОрПвать" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют прПблеЌы, а ПпцОя -y ОспПльзПваМа без --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "ВМутреММяя ПшОбка, InstallPackages была вызваМа с МерабПтПспПсПбМыЌО " "пакетаЌО!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты МеПбхПЎОЌП уЎалОть, МП уЎалеМОе запрещеМП." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "ВМутреММяя ПшОбка, Ordering Ме завершОлась" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "НевПзЌПжМП заблПкОрПвать каталПг Ўля загрузкО" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не чОтается перечеМь ОстПчМОкПв." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "СтраММП.. НесПвпаЎеМОе разЌерПв, МапОшОте Ма apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "НеПбхПЎОЌП скачать %sB/%sB архОвПв.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "НеПбхПЎОЌП скачать %sБ архОвПв.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "ППсле распакПвкО ПбъеЌ заМятПгП ЎОскПвПгП прПстраМства вПзрастёт Ма %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "ППсле распакПвкО ПбъеЌ заМятПгП ЎОскПвПгП прПстраМства уЌеМьшОтся Ма %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не уЎалПсь ПпреЎелОть кПлОчествП свПбПЎМПгП Ќеста в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "НеЎПстатПчМП свПбПЎМПгП Ќеста в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "ЗапрПшеМП выпПлМеМОе тПлькП трОвОальМых ПперацОй, МП этП Ме трОвОальМая " "ПперацОя." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Да, Ўелать, как я скажу!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -881,28 +892,28 @@ msgstr "" "ЧтПбы прПЎПлжОть, ввеЎОте фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "АварОйМПе завершеМОе." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "ХПтОте прПЎПлжОть [Д/Ðœ]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не уЎалПсь загрузОть %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "НекПтПрые файлы Ме уЎалПсь загрузОть" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "УказаМ режОЌ \"тПлькП загрузка\", О загрузка завершеМа" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -910,48 +921,48 @@ msgstr "" "НевПзЌПжМП загрузОть МекПтПрые архОвы, верПятМП МаЎП запустОть apt-get " "update ОлО пПпытаться пПвтПрОть запуск с ключПЌ --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing О сЌеМа МПсОтеля в ЎаММый ЌПЌеМт Ме пПЎЎержОваются" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "НевПзЌПжМП ОсправОть сОтуацОю с прПпущеММыЌО пакетаЌО." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "АварОйМПе завершеМОе устаМПвкО." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "ЗаЌетьте, вЌестП %2$s выбОрается %1$s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "ПрПпускается %s - пакет уже устаМПвлеМ, О ПпцОя upgrade Ме устаМПвлеМа.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s Ме устаМПвлеМ, пПэтПЌу Ме ЌПжет быть уЎалёМ\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - вОртуальМый, егП фуМкцОО преЎПставляются пакетаЌО:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [УстаМПвлеМ]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Вы ЎПлжМы явМП указать, какПй ОЌеММП вы хПтОте устаМПвОть." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -962,49 +973,49 @@ msgstr "" "ЭтП ЌПжет ПзМачать, чтП пакет Птсутствует, устарел, ОлО ЎПступеМ Оз " "ОстПчМОкПв, Ме упПЌяМутых в sources.list\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "ОЎМакП слеЎующОе пакеты ЌПгут егП заЌеМОть:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s Ме МайЎеМы каМЎОЎаты Ма устаМПвку" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ПереустаМПвка %s МевПзЌПжМа, ПМ Ме загружается.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже устаМПвлеМа саЌая МПвая версОя %s.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "РелОз '%s' Ўля '%s' Ме МайЎеМ" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ВерсОя '%s' Ўля '%s' Ме МайЎеМа" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "ВыбраМа версОя %s (%s) Ўля %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "КПЌаМЎе update Ме МужМы аргуЌеМты" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "НевПзЌПжМП заблПкОрПвать каталПг сП спОскаЌО пакетПв" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1012,27 +1023,27 @@ msgstr "" "НекПтПрые ОМЎексМые файлы Ме загрузОлОсь, ПМО былО прПОгМПрОрПваМы ОлО " "вЌестП МОх былО ОспПльзПваМы старые версОО" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "ВМутреММяя ПшОбка, AllUpgrade все пПлПЌал" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Не ЌПгу МайтО пакет %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ЗаЌетьте, регулярМПе выражеМОе %2$s прОвПЎОт к выбПру %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "ВПзЌПжМП, Ўля ОсправлеМОя этОх ПшОбПк вы захПтОте вПспПльзПваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1040,7 +1051,7 @@ msgstr "" "НеуЎПвлетвПрёММые завОсОЌПстО. ППпытайтесь выпПлМОть 'apt-get -f install', " "Ме указывая ОЌеМО пакета, (ОлО МайЎОте ЎругПе решеМОе)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1051,7 +1062,7 @@ msgstr "" "ОлО же ОспПльзуете МестабОльМПгП ЎОстрОбутОв, О запрПшеММые ВаЌО пакеты\n" "ещё Ме сПзЎаМы ОлО былО уЎалеМы Оз Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1061,125 +1072,125 @@ msgstr "" "пакет прПстП Ме ЌПжет быть устаМПвлеМ Оз-за ПшОбПк в саЌПЌ пакете.\n" "НеПбхПЎОЌП пПслать Птчёт Пб этПй ПшОбке." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "СлеЎующая ОМфПрЌацОя вПзЌПжМП пПЌПжет ВаЌ:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "СлПЌаММые пакеты" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "БуЎут устаМПвлеМы слеЎующОе ЎПпПлМОтельМые пакеты:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "ПреЎлагаеЌые пакеты:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "РекПЌеМЎуеЌые пакеты:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Расчёт ПбМПвлеМОй... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "НеуЎачМП" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "ГПтПвП" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "ВМутреММяя ПшОбка, решатель прПблеЌ всё пПлПЌал" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "УкажОте как ЌОМОЌуЌ ПЎОМ пакет, Ўля кПтПрПгП МеПбхПЎОЌП загрузОть ОсхПЎМые " "тексты" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "НевПзЌПжМП МайтО пакет с ОсхПЎМыЌО текстаЌО Ўля %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "ПрПпускаеЌ уже загружеММый файл '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "НеЎПстатПчМП Ќеста в %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "НеПбхПЎОЌП загрузОть %sB/%sB Оз архОвПв ОсхПЎМых текстПв.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "НужМП загрузОть %sB архОвПв с ОсхПЎМыЌО текстаЌО.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка ОсхПЎМых текстПв %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "НекПтПрые архОвы Ме уЎалПсь загрузОть." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "РаспакПвка ОсхПЎМых текстПв прПпущеМа, так как в %s уже МахПЎятся " "распакПваММые ОсхПЎМые тексты\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "КПЌаМЎа распакПвкО '%s' завершОлась МеуЎачМП.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ПрПверьте, устаМПвлеМ лО пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "КПЌаМЎа сбПркО '%s' завершОлась МеуЎачМП.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "ППрПжЎёММый прПцесс завершОлся МеуЎачМП" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для прПверкО завОсОЌПстей Ўля сбПркО МеПбхПЎОЌП указать как ЌОМОЌуЌ ПЎОМ " "пакет" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "НевПзЌПжМП пПлучОть ОМфПрЌацОю П завОсОЌПстях Ўля сбПркО %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s Ме ОЌеет завОсОЌПстей Ўля сбПркО.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1199,7 @@ msgstr "" "ЗавОсОЌПсть тОпа %s Ўля %s Ме ЌПжет быть уЎПвлетвПреМа, так как пакет %s Ме " "МайЎеМ" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1208,32 @@ msgstr "" "ЗавОсОЌПсть тОпа %s Ўля %s Ме ЌПжет быть уЎПвлетвПреМа, пПскПльку МО ПЎМа Оз " "версОй пакета %s Ме уЎПвлетвПряет требПваМОяЌ" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не уЎалПсь уЎПвлетвПрОть завОсОЌПсть тОпа %s Ўля пакета %s: УстаМПвлеММый " "пакет %s МПвее, чеЌ МаЎП" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "НевПзЌПжМП уЎПвлетвПрОть завОсОЌПсть тОпа %s Ўля пакета %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ЗавОсОЌПстО Ўля сбПркО %s Ме ЌПгут быть уЎПвлетвПреМы." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "ОбрабПтка завОсОЌПстей Ўля сбПркО завершОлась МеуЎачМП" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "ППЎЎержОваеЌые ЌПЎулО:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1405,19 +1416,19 @@ msgstr "ОбъеЎОМеМОе ОМфПрЌацОО П ЎПступМых пак msgid "Failed to create pipes" msgstr "Не уЎалПсь сПзЎать пПрПжЎёММые прПцессы" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Не уЎалПсь выпПлМОть gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "ППврежЎёММый архОв" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "НеправОльМая кПМтрПльМая суЌЌа Tar, архОв пПврежЎёМ" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "НеОзвестМый загПлПвПк в архОве TAR. ТОп %u, элеЌеМт %s" @@ -1696,12 +1707,12 @@ msgstr "ДОск Ме МайЎеМ." msgid "File not found" msgstr "Ѐайл Ме МайЎеМ" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Не уЎалПсь пПлучОть атрОбуты" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Не уЎалПсь устаМПвОть вреЌя ЌПЎОфОкацОО" @@ -1918,42 +1929,42 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "НевПзЌПжМП сПеЎОМОться с %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Не ЌПгу МайтО IP аЎрес Ўля %s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: СлОшкПЌ бПльшПй спОсПк параЌетрПв у Acquire::gpgv::Options. ЗавершеМОе " "рабПты." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ВМутреММяя ПшОбка: ПравОльМая пПЎпОсь, МП Ме уЎалПсь ПпреЎелОть ПтпечатПк " "ключа?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "НайЎеМа как ЌОМОЌуЌ ПЎМа МеправОльМая пПЎпОсь." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "Ўля прПверкО пПЎпОсО (gnupg устаМПвлеМа?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "НеОзвестМая ПшОбка прО выпПлМеМОО gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "СлеЎующОе пПЎпОсО МеверМые:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2326,24 +2337,24 @@ msgstr "МеПбязательМый" msgid "extra" msgstr "ЎПпПлМОтельМый" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "ППстрПеМОе Ўерева завОсОЌПстей" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "ВерсОО-каМЎОЎаты" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "ГеМерОрПваМОе завОсОЌПстей" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "НевПзЌПжМП прПчесть сПЎержОЌПе пакета %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "НевПзЌПжМП прПчесть сПЎержОЌПе пакета %s (2)" @@ -2471,12 +2482,12 @@ msgstr "МетПЎ %s запустОлся Ме кПрректМП" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте ЎОск с ЌеткПй '%s' в устрПйствП '%s' О МажЌОте ввПЎ." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "МеМеЎжер пакетПв '%s' Ме пПЎЎержОвается" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "НевПзЌПжМП ПпреЎелОть пПЎхПЎящОй тОп ЌеМеЎжера пакетПв" @@ -2787,6 +2798,9 @@ msgstr "Не уЎалПсь уЎалОть %s" msgid "Connection closed prematurely" msgstr "СПеЎОМеМОе закрытП прежЎевреЌеММП" +#~ msgid "File date has changed %s" +#~ msgstr "Дата файла %s ОзЌеМОлась" + #~ msgid "Reading file list" #~ msgstr "ЧтеМОе спОска файлПв в пакете" diff --git a/po/sk.po b/po/sk.po index d4fe815da..639f4bb1a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-29 15:33+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovanÃœ na %s %s\n" @@ -422,115 +422,126 @@ msgstr "Nevyhovel ÅŸiaden vÃœber" msgid "Some files are missing in the package file group `%s'" msgstr "V balíkovom súbore skupiny `%s' chÃœbajú niektoré súbory" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je naruÅ¡ená, súbor je premenovanÃœ na %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriÅ¥ DB súbor %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Dátum súboru sa zmenil %s" +msgid "Failed to stat %s" +msgstr "%s sa nedá vyhodnotiÅ¥" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archív nemá riadiaci záznam" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nedá sa získaÅ¥ kurzor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Adresár %s sa nedá čítaÅ¥\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s sa nedá vyhodnotiÅ¥\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Chyby sa tÃœkajú súboru " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Chyba pri zisÅ¥ovaní %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Priechod stromom zlyhal" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s sa nedá otvoriÅ¥" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkovanie %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Linka %s sa nedá čítaÅ¥" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "%s sa nedá odlinkovaÅ¥" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepodarilo sa zlinkovaÅ¥ %s s %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutÃœ odlinkovací limit %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s sa nedá vyhodnotiÅ¥" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archív neobsahuje pole package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá ÅŸiadnu poloÅŸku pre override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nemá ÅŸiadnu poloÅŸku pre override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nemá ÅŸiadnu poloÅŸku pre override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -630,7 +641,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho vÃœrazu - %s" @@ -731,120 +742,120 @@ msgstr "%lu na odstránenie a %lu neaktualizovanÃœch.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainÅ¡talovanÃœch alebo odstránenÃœch.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviÅ¥" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovaÅ¥" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu mÃŽÅŸete spustiÅ¥ `apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste pouÅŸiÅ¥ -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovnÃœch balíkoch sa nedá overiÅ¥ vierohodnosÅ¥!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "NainÅ¡talovaÅ¥ tieto nekontrolované balíky [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiÅ¥ vierohodnosÅ¥ niektorÃœch balíkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo pouÅŸité bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poÅ¡kodenÃœmi balíkmi!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia OdstrániÅ¥ je vypnutá." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítaÅ¥ zoznam zdrojov." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosÅ¥... VeÄŸkosti nesúhlasia, poÅ¡lite e-mail na apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB archívov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB archívov.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku pouÅŸije ďalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoÄŸní %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiÅ¥ veÄŸkosÅ¥ voÄŸného miesta" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voÄŸného miesta." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -855,28 +866,28 @@ msgstr "" "Pre pokračovanie opíšte frázu '%s'\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "PreruÅ¡ené." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovaÅ¥ [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukončené v reÅŸime \"iba stiahnuÅ¥\"" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -884,47 +895,47 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuÅ¥. Skúste spustiÅ¥ apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a vÃœmena média nie sú momentálne podporované" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "ChÃœbajúce balíky sa nedajú opraviÅ¥." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "InÅ¡talácia sa preruÅ¡uje." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretoÅŸe je uÅŸ nainÅ¡talovanÃœ.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainÅ¡talovanÃœ, nedá sa teda odstrániÅ¥\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovanÃœ:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr "[InÅ¡talovanÃœ]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybraÅ¥ jeden na inÅ¡taláciu." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -934,49 +945,49 @@ msgstr "" "Balík %s nie je dostupnÃœ, ale odkazuje naň inÃœ balík. MoÅŸno to znamená,\n" "ÅŸe balík chÃœba, bol zruÅ¡enÃœ, alebo je dostupnÃœ iba z iného zdroja\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "AvÅ¡ak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inÅ¡taláciu" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je moÅŸná reinÅ¡talácia %s, pretoÅŸe sa nedá stiahnuÅ¥.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je uÅŸ najnovÅ¡ej verzie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma ÅŸiadne argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -984,25 +995,25 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované, alebo sa " "pouÅŸili starÅ¡ie verzie." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny vÃœraz '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovnÃœch mÃŽÅŸete spustiÅ¥ `apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1010,7 +1021,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " "navrhnite rieÅ¡enie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1022,7 +1033,7 @@ msgstr "" "poÅŸadované balíky eÅ¡te neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1032,128 +1043,128 @@ msgstr "" "balík nie je inÅ¡talovateÄŸnÃœ a mali by ste zaslaÅ¥ hlásenie o chybe\n" "(bug report) pre danÃœ balík." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám moÅŸno pomÃŽÅŸu vyrieÅ¡iÅ¥ túto situáciu:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadaÅ¥ aspoň jeden balík, pre ktorÃœ sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsÅ¥ zdrojovÃœ balík pre %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa uÅŸ stiahnutÃœ súbor '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voÄŸného miesta" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB zdrojovÃœch archívov.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB zdrojovÃœch archívov.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorÃœch archívov." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie uÅŸ rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainÅ¡talovanÃœ balík 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadaÅ¥ aspoň jeden balík, pre ktorÃœ sa budú overovaÅ¥ závislosti na " "zostavenie" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získaÅ¥ závislosti pre zostavenie %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá ÅŸiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosÅ¥ pre %s sa nemÃŽÅŸe splniÅ¥, pretoÅŸe sa nedá nájsÅ¥ balík %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1162,31 +1173,31 @@ msgstr "" "%s závislosÅ¥ pre %s sa nedá splniÅ¥, protoÅŸe sa nedá nájsÅ¥ verzia balíku %s, " "ktorá zodpovedá poÅŸiadavke na verziu" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: InÅ¡talovanÃœ balík %s je príliÅ¡ novÃœ" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1366,19 +1377,19 @@ msgstr "Zlučujú sa dostupné informácie" msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "PoruÅ¡enÃœ archív" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "KontrolnÃœ súčet pre tar zlyhal, archív je poÅ¡kodenÃœ" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma hlavička TARu typ %u, člen %s" @@ -1658,12 +1669,12 @@ msgstr "Disk sa nenaÅ¡iel." msgid "File not found" msgstr "Súbor sa nenaÅ¡iel" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1875,40 +1886,40 @@ msgstr "Niečo veÄŸmi zlé sa prihodilo pri zisÅ¥ovaní '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nedá sa pripojiÅ¥ k %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "ZvÀzok kğúčov '%s' je nedostupnÃœ." -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliÅ¡ dlhÃœ. Ukončuje " "sa." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiÅ¥ odtlačok kğúča?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "Nedá sa spustiÅ¥ '%s' na kontrolu signatúry (je nainÅ¡talované gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2275,24 +2286,24 @@ msgstr "voliteÄŸnÃœ" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovaÅ¥ (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovaÅ¥ (2)" @@ -2418,12 +2429,12 @@ msgstr "SpÃŽsob %s nebol správne spustenÃœ" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "VloÅŸte disk nazvanÃœ '%s' do mechaniky '%s' a stlačte Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovanÃœ" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiÅ¥ vhodnÃœ typ balíčkovacieho systému" @@ -2732,3 +2743,6 @@ msgstr "Balík '%s' je úplne odstránenÃœ" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" + +#~ msgid "File date has changed %s" +#~ msgstr "Dátum súboru sa zmenil %s" diff --git a/po/sl.po b/po/sl.po index 06ac46e05..b2f755eca 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -424,115 +424,126 @@ msgstr "Nobena izbira se ne ujema" msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ZP je stara, posku¹am nadgraditi %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoèe odprti datoteke ZP %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum datoteke se je spremenil %s" +msgid "Failed to stat %s" +msgstr "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni mogoèe najti kazalca" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoèe brati imenika %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoèe nastaviti %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "O: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoèe razre¹iti %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Hoja drevesa ni uspela" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Ni mogoèe odprti %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVeŸi %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Napaka pri branju povezave %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka pri povezovanju %s z %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DoseŸena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Napaka pri postavitvi %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " VzdrŸevalec %s je %s in ne %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nima prekrivnega vnosa\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nima prekrivnega vnosa\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -632,7 +643,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -734,119 +745,119 @@ msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Ni mogoèe popraviti odvisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Èe Ÿelite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Pri¹lo je do teŸav in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoèe brati." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je moŸnost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -857,28 +868,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Ali Ÿelite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoèe dobiti %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -886,47 +897,47 @@ msgstr "" "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Ni mogoèe popraviti manjkajoèih paketov." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoèen, ker je Ÿe name¹èen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni name¹èen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Name¹èeno]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga Ÿelite namestiti." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -937,49 +948,49 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni moŸna, ker ni moŸen prenos.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnovej¹a razlièica %s je Ÿe name¹èena.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoèe najti" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razlièice '%s' za '%s' ni mogoèe najti" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razlièica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoèe zakleniti" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -987,25 +998,25 @@ msgstr "" "Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " "uporabljena starej¹a." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', èe Ÿelite popraviti:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1013,7 +1024,7 @@ msgstr "" "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1024,7 +1035,7 @@ msgstr "" "nemogoè poloŸaj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1034,130 +1045,130 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloŸiti poroèilo o hro¹èu\n" "o tem paketu." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali re¹iti teŸavo:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega Ÿelite dobiti izorno kodo" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje Ÿe odpakiranih izvornih paketov v %s preskoèeno\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje Ÿe odpakiranih izvornih paketov v %s preskoèeno\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega Ÿelite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1166,31 +1177,31 @@ msgstr "" "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne " "more zadostiti zahtevi po razlièici" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1372,19 +1383,19 @@ msgstr "Spajanje informacij na voljo" msgid "Failed to create pipes" msgstr "Ni mogoèe ustvariti pip" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Ni mogoèe izvesti gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznan tip glave TAR %u, èlan %s" @@ -1664,12 +1675,12 @@ msgstr "Datoteke ni mogo msgid "File not found" msgstr "Datoteke ni mogoèe najti" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Doloèitev ni uspela" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nastavitev èasa spremembe ni uspela" @@ -1881,39 +1892,39 @@ msgstr "Pri msgid "Unable to connect to %s %s:" msgstr "Ni se mogoèe povezati z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Ni mogoèe razre¹iti '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo name¹èeni:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2278,24 +2289,24 @@ msgstr "izbirno" msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Razlièice kandidatov" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)" @@ -2425,12 +2436,12 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema" @@ -2741,6 +2752,9 @@ msgstr "Odstranitev %s ni uspela" msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#~ msgid "File date has changed %s" +#~ msgstr "Datum datoteke se je spremenil %s" + #~ msgid "Reading file list" #~ msgstr "Branje seznama datotek" diff --git a/po/sv.po b/po/sv.po index 5d347abe4..ffad16fb1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-18 08:35+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@ -424,119 +424,129 @@ msgstr "Inga val tr msgid "Some files are missing in the package file group `%s'" msgstr "Några filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var trasig, filen omdöpt till %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB är för gammal, försöker uppgradera %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunde inte öppna DB-filen %s: %s" -# Felmeddelande för misslyckad chdir -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fildatumet har ändrats %s" +msgid "Failed to stat %s" +msgstr "Misslyckades att ta status på %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte läsa katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "V: Kunde inte ta status på %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "V: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Felen gäller filen " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades att slå upp %s" # ??? -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Trävandring misslyckades" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Misslyckades att öppna %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Avlänka %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades att läsa länk %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades att länka ut %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades att länka %s till %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgräns på %sB nådd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Misslyckades att ta status på %s" - # Fält vid namn "Package" -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för %s är %s ej %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen post i override-filen\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen post i override-filen\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -638,7 +648,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" @@ -739,120 +749,120 @@ msgstr "%lu att ta bort och %lu ej uppgraderade.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Rättar beroenden...." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Kunde inte rätta beroenden" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsättningen" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Färdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan möjligen rätta dessa genom att köra \"apt-get -f install\"." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Försök med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Authentiseringsvarning överkörd.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Paket måste tas bort men \"Remove\" är inaktiverat." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian." "org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behöver hämta %sB/%sB arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behöver hämta %sB arkiv.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter uppackning kommer %sB ytterligare diskutrymme användas.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte läsa av ledigt utrymme i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +874,28 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hämta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,48 +903,48 @@ msgstr "" "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " "--fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte ännu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Kunde inte rätta saknade paket." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, väljer %s istället för %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s är inte installerat, så tas inte bort\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Du bör explicit ange ett att installera." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,49 +955,49 @@ msgstr "" "Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n" "bara är tillgängligt från andra källor\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Dock kan följande paket ersätta det:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,25 +1005,25 @@ msgstr "" "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för regex \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1021,7 +1031,7 @@ msgstr "" "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1033,7 +1043,7 @@ msgstr "" "distributionen, att några krävda paket ännu inte har skapats eller\n" "lagts in från \"Incoming\"." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,119 +1053,119 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta bör\n" "skrivas." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren bröt sönder saker" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtad fil \"%s\"\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkod %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Misslyckades att hämta vissa arkiv." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Kontrollera att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta byggberoendeinformation för %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1163,7 +1173,7 @@ msgid "" msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1172,32 +1182,32 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " "är för nytt" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1383,19 +1393,19 @@ msgstr "L msgid "Failed to create pipes" msgstr "Misslyckades att skapa rör" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Misslyckades att köra gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Fördärvat arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Okänd TAR-huvudtyp %u, del %s" @@ -1678,12 +1688,12 @@ msgstr "Disk ej funnen." msgid "File not found" msgstr "Filen ej funnen" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Misslyckades sätta modifieringstid" @@ -1899,40 +1909,40 @@ msgstr "N msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Kunde inte komma åt nyckelring: \"%s\"" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Åtminstone en giltig signatur träffades på." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid exekvering av gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2303,24 +2313,24 @@ msgstr "valfri" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Bygger beroendeträd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" @@ -2448,13 +2458,13 @@ msgstr "Metoden %s startade inte korrekt" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stöds inte" # -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgöra en lämpligt paketsystemstyp" @@ -2764,6 +2774,10 @@ msgstr "Tog bort hela %s" msgid "Connection closed prematurely" msgstr "Förbindelsen stängdes i förtid" +# Felmeddelande för misslyckad chdir +#~ msgid "File date has changed %s" +#~ msgstr "Fildatumet har ändrats %s" + #~ msgid "Reading file list" #~ msgstr "Läser fillista" diff --git a/po/tl.po b/po/tl.po index 669177a90..09f8de19c 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-03-16 15:53+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -434,115 +434,126 @@ msgstr "Walang mga pinili na tugma" msgid "Some files are missing in the package file group `%s'" msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Nagbago ang petsa ng talaksang %s" +msgid "Failed to stat %s" +msgstr "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Hindi mabasa ang directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Hindi ma-stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Mga error ay tumutukoy sa talaksang " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Bigo sa pag-resolba ng %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Bigo ang paglakad sa puno" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Bigo ang pagbukas ng %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Bigo ang pagbasa ng link %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Bigo ang pag-unlink ng %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Bigo ang pag-link ng %s sa %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Bigo ang pag-stat ng %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s ay walang override entry\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s ay walang override entry\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -642,7 +653,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -743,125 +754,125 @@ msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " ay bigo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." "org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,28 +883,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,48 +912,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -953,49 +964,49 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1003,26 +1014,26 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1041,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1041,7 +1052,7 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1051,120 +1062,120 @@ msgstr "" "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1173,7 +1184,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1182,32 +1193,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1390,19 +1401,19 @@ msgstr "Pinagsasama ang magagamit na impormasyon" msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" @@ -1683,12 +1694,12 @@ msgstr "Hindi nahanap ang Disk." msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1900,42 +1911,42 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Hindi maka-konek sa %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " "Lalabas." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2307,24 +2318,24 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" @@ -2455,12 +2466,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@ -2778,6 +2789,9 @@ msgstr "Bigo sa pagtanggal ng %s" msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ msgid "File date has changed %s" +#~ msgstr "Nagbago ang petsa ng talaksang %s" + #~ msgid "Reading file list" #~ msgstr "Binabasa ang Talaksang Listahan" diff --git a/po/vi.po b/po/vi.po index bae8ca5cd..1195cd78d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-05-19 22:19+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" @@ -455,115 +455,126 @@ msgstr "KhÃŽng có điều đã chọn khớp được" msgid "Some files are missing in the package file group `%s'" msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »." -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "CÆ¡ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cÅ©)." -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "CÆ¡ sở dữ liệu cÅ© nên đang cố nâng cấp lên %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "KhÃŽng thể mở tập tin cÆ¡ sở dữ liệu %s: %s." -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Ngày tập tin đã đổi %s" +msgid "Failed to stat %s" +msgstr "Việc lấy thÃŽng tin toàn bộ cho %s bị lỗi" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Kho khÃŽng có mục ghi điều khiển" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "KhÃŽng thể lấy con chạy" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: KhÃŽng thể đọc thÆ° mục %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: KhÃŽng thể lấy thÃŽng tin toàn bộ cho %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: có lỗi áp dụng vào tập tin " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Việc quyết định %s bị lỗi" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Việc di chuyển qua cây bị lỗi" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Việc mở %s bị lỗi" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Bỏ liên kết %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Việc tạo liên kết lại %s bị lỗi" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Việc bỏ liên kết %s bị lỗi" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Việc liên kết %s đến %s bị lỗi" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Việc lấy thÃŽng tin toàn bộ cho %s bị lỗi" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Kho khÃŽng có trường gói" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s khÃŽng có mục ghi đÚ\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s khÃŽng phải %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s khÃŽng có mục ghi đÚ\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s khÃŽng có mục ghi đÚ\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -663,7 +674,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi" msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@ -764,122 +775,122 @@ msgstr "%lu cần gỡ bỏ, và %lu chÆ°a được nâng cấp.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu chÆ°a được cài đặt toàn bộ hay được gỡ bỏ.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Đang sá»­a cách phụ thuộc..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " đã thất bại." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "KhÃŽng thể sá»­a cách phụ thuộc" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "KhÃŽng thể cá»±c tiểu hóa bộ nâng cấp" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Đã xong" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Có lẜ bạn hãy chay lệnh « apt-get -f install » để sá»­a hết." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "" "Còn có cách phụ thuộc vào phần mềm chÆ°a có. NhÆ° thế thì bạn hãy cố dùng tùy " "chọn « -f »." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO : khÃŽng thể xác thá»±c những gói theo đây." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thá»±c bị đÚ.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "Cài đặt những gói này mà khÃŽng kiểm chứng khÃŽng? [y/N] [c/K] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Một số gói khÃŽng thể được xác thá»±c" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà khÃŽng có « --force-yes »" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhÆ°ng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chÆ°a xong" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "KhÃŽng thể khóa thÆ° mục tải về" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "KhÃŽng thể đọc danh sách nguồn." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ... Hai kích cỡ khÃŽng khớp được. Hãy gởi thÆ° cho " -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB kho.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB kho.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Sau khi đã giải nén, sẜ giải phóng %sB sức chữa đĩa thêm.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "KhÃŽng thể quyết định chỗ rảnh trong %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn chÆ°a có đủ sức chức còn rảnh trong %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Xác đinh « Chỉ khÃŽng đáng kể » (Trivial Only) nhÆ°ng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Có, làm đi." -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -890,28 +901,28 @@ msgstr "" "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục khÃŽng? [Y/n] [C/k] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Một số tập tin khÃŽng tải về được" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -919,49 +930,49 @@ msgstr "" "KhÃŽng thể lấy một số kho, có lẜ hãy chạy lệnh « apt-get update » (apt lấy " "cập nhật) hay cố với « --fix-missing » (sá»­a các điều còn thiếu) khÃŽng?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ChÆ°a hÃŽ trợ tùy chọn « --fix-missing » (sá»­a khi thiếu điều) và trao đổi " "phÆ°Æ¡ng tiện." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "KhÃŽng thể sá»­a những gói còn thiếu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Đang hủy bỏ cài đặt." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ghi chú : đang chọn %s thay vì %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chÆ°a lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "ChÆ°a cài đặt gói %s nên khÃŽng thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do :\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -972,49 +983,49 @@ msgstr "" "đã tham chiếu đến nó. Có lẜ có nghÄ©a là gói còn thiếu,\n" "đã trở thành cÅ©, hay chỉ sẵn sàng từ nguồn khác.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó :" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "Gói %s khÃŽng có ứng cá»­ cài đặt" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "KhÃŽng thể cài đặt lại %s vì khÃŽng thể tải về nó.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mÆ¡i nhất.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "KhÃŽng tìm thấy bản phát hành « %s » cho « %s »" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "KhÃŽng tìm thấy phiên bản « %s » cho « %s »" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật khÃŽng chấp nhật đối số" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "KhÃŽng thể khóa thÆ° mục danh sách" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1022,25 +1033,25 @@ msgstr "" "Một số tập tin chỉ mục khÃŽng tải về được, đã bỏ qua chúng, hoặc điều cÅ© được " "dùng thay thế." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "KhÃŽng tìm thấy gói %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẜ bạn hãy chạy lênh « apt-get -f install » để sá»­a hết:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1048,7 +1059,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chÆ°a có. Hãy cố chạy lệnh « apt-get -f " "install » mà khÃŽng có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1060,7 +1071,7 @@ msgstr "" "bất định, có lẜ chÆ°a tạo một số gói cần thiết,\n" "hoặc chÆ°a di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1070,127 +1081,127 @@ msgstr "" "gói này đơn giản khÃŽng có khả năng cài đặt, thì bạn hay\n" "thÃŽng báo lỗi về gói này." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Có lẜ thÃŽng tin theo đây sẜ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẜ được cài đặt:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "KhÃŽng tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "KhÃŽng đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chÆ°a.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "KhÃŽng thể lấy thÃŽng tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s khÃŽng phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s khÃŽng thể được thỏa vì khÃŽng tìm thấy gọi %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1199,31 +1210,31 @@ msgstr "" "cách phụ thuộc %s cho %s khÃŽng thể được thỏa vì khÃŽng có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "KhÃŽng thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Việc xá»­ lÃœ cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "MÃŽ-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1414,19 +1425,19 @@ msgstr "Đang hợp nhất các thÃŽng tin sẵn sàng..." msgid "Failed to create pipes" msgstr "Việc tạo những ống bị lỗi" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Việc thá»±c hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "KhÃŽng biết kiểu phần đầu tar %u, bộ phạn %s" @@ -1709,12 +1720,12 @@ msgstr "KhÃŽng tìm thấy đĩa" msgid "File not found" msgstr "KhÃŽng tìm thấy tập tin" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Việc lấy các thÃŽng tin bị lỗi" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Việc lập giờ sá»­a đổi bị lỗi" @@ -1926,39 +1937,39 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" msgid "Unable to connect to %s %s:" msgstr "KhÃŽng thể kết nối đến %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "KhÃŽng thể truy cập vòng khoá « %s »" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: chữ kÃœ đúng, nhÆ°ng khÃŽng thể quyết định vân tay khóa ?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ kÃœ khÃŽng hợp lệ." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "KhÃŽng thể thá»±c hiện « %s » để kiểm chứng chữ kÃœ (gnupg có được cài đặt chÆ°a?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi lạ khi thá»±c hiện gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Những chữ kÃœ theo đây là khÃŽng hợp lệ:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2327,24 +2338,24 @@ msgstr "tùy chọn" msgid "extra" msgstr "thêm" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Đang xây dụng cây cách phụ thuộc..." -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Phiên bản ứng cá»­" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Tạo ra cách phụ thuộc" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "KhÃŽng thể phân tách tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "KhÃŽng thể phân tách tập tin gói %s (2)" @@ -2474,12 +2485,12 @@ msgstr "PhÆ°Æ¡ng pháp %s đã khÃŽng bắt đầu cho đúng." msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "KhÃŽng hỗ trợ hệ thống đóng gói « %s »" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "KhÃŽng thể quyết định kiểu hệ thống đóng gói thích hợp" @@ -2797,6 +2808,9 @@ msgstr "Mới gỡ bỏ hoàn toàn %s" msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." +#~ msgid "File date has changed %s" +#~ msgstr "Ngày tập tin đã đổi %s" + #~ msgid "Reading file list" #~ msgstr "Đang đọc danh sách tâp tin..." diff --git a/po/zh_CN.po b/po/zh_CN.po index 789101a74..d59251bbc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2006-02-22 14:20+1300\n" "Last-Translator: Carlos Z.F. Liu \n" "Language-Team: Debian Chinese [GB] \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s 猖译于 %s %s\n" @@ -422,115 +422,126 @@ msgstr "没有任䜕选定项是匹配的" msgid "Some files are missing in the package file group `%s'" msgstr "蜯件包文件组“%s”䞭猺少䞀些文件" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "猓存数据库被损坏了该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 已过时现试囟进行升级 %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打匀 DB 文件 %s%s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "文件 %s 的时闎已被改劚" +msgid "Failed to stat %s" +msgstr "无法读取 %s 的状态" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "存档没有包含控制字段" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "无法获埗枞标(cursor)" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "譊告无法读取目圕 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "譊告无法对 %s 进行统计\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "错误" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "譊告" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "错误倄理文件时出错 " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路埄 %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "无法遍历目圕树" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "无法打匀 %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "无法读取笊号铟接 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 铟接到 %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 蟟到了 DeLink 的侊限 %sB。\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "无法读取 %s 的状态" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "存档没有包含蜯件包(package)字段" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s 䞭没有 override 项\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的绎技者 %s 并非 %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s 䞭没有 override 项\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s 䞭没有 override 项\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -630,7 +641,7 @@ msgstr "无法将 %s 重呜名䞺 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "猖译正则衚蟟匏时出错 - %s" @@ -731,118 +742,118 @@ msgstr "芁卞蜜 %lu 䞪蜯件包有 %lu 䞪蜯件未被升级。\n" msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 䞪蜯件包没有被完党安装或卞蜜。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "正圚曎正䟝赖关系..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " 倱莥。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "无法曎正䟝赖关系" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "无法最小化芁升级的蜯件包集合" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "悚也讞需芁运行“apt-get -f install”来纠正䞊面的错误。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "䞍胜满足䟝赖关系。䞍劚试䞀䞋 -f 选项。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【譊告】䞋列的蜯件包䞍胜通过验证" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "応略了讀证譊告。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "䞍经验证就安装这些蜯件包么[y/N] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "有些蜯件包䞍胜通过验证" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了䞀些问题悚䜿甚了 -y 选项䜆是没有甚 --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内郚错误InstallPackages 被甚圚了无法安装的蜯件包䞊" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "有蜯件包需芁被卞蜜䜆是卞蜜劚䜜被皋序讟眮所犁止。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "内郚错误Ordering 没有完成" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "无法对䞋蜜目圕加锁" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列衚。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了  文件倧小䞍笊发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需芁䞋蜜 %sB/%sB 的蜯件包。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需芁䞋蜜 %sB 的蜯件包。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压猩后䌚消耗掉 %sB 的额倖空闎。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压猩后将䌚空出 %sB 的空闎。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知悚圚 %s 䞊的空䜙空闎" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "悚圚 %s 䞭没有足借的空䜙空闎。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虜然悚指定了 Trivial Only䜆这䞍是䞪日垞(trivial)操䜜。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -853,28 +864,28 @@ msgstr "" "若还想继续的话就蟓入䞋面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "䞭止执行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "悚垌望继续执行吗[Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法䞋蜜 %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "有䞀些文件䞋蜜倱莥" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "䞋蜜完毕目前是“仅䞋蜜”暡匏" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -882,47 +893,47 @@ msgstr "" "有几䞪蜯件包无法䞋蜜悚可以运行 apt-get update 或者加䞊 --fix-missing 的选项" "再试试" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还䞍支持 --fix-missing 和介莚亀换(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "无法曎正猺少的蜯件包。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "攟匃安装。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "泚意我选了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "応略了 %s它已经被安装而䞔没有指定芁升级。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "蜯件包 %s 还未安装因而䞍䌚被卞蜜\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "蜯件包 %s 是䞀䞪由䞋面的蜯件包提䟛的虚拟蜯件包\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "请悚明确地选择䞀䞪来进行安装。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -933,74 +944,74 @@ msgstr "" "这可胜意味着这䞪猺倱的蜯件包可胜已被废匃\n" "或者只胜圚其他发垃源䞭扟到\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "可是䞋列的蜯件包取代了它" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "蜯件包 %s 还没有可䟛安装的候选者" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "䞍胜重新安装 %s因䞺无法䞋蜜它。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未扟到“%2$s”的“%1$s”发垃版本" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未扟到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本䞺 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr " update 呜什是䞍需任䜕参数的" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "无法对状态列衚目圕加锁" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有䞀些玢匕文件䞍胜䞋蜜它们可胜被応略了也可胜蜬而䜿甚了旧的玢匕文件。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "内郚错误AllUpgrade 坏事了" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "无法扟到蜯件包 %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "泚意根据正则衚蟟匏“%2$s”选䞭了 %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "悚可胜需芁运行“apt-get -f install”来纠正䞋列错误" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1008,7 +1019,7 @@ msgstr "" "有未胜满足的䟝赖关系。请尝试䞍指明蜯件包的名字来运行“apt-get -f install”(也可" "以指定䞀䞪解决办法)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1019,7 +1030,7 @@ msgstr "" "因䞺系统无法蟟到悚芁求的状态造成的。该版本䞭可胜䌚有䞀些悚需芁的蜯件\n" "包尚未被创建或是它们还圚新到(incoming)目圕䞭。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,126 +1039,126 @@ msgstr "" "悚仅芁求对单䞀蜯件包进行操䜜这极有可胜是因䞺该蜯件包安装䞍䞊同时\n" "悚最奜提亀䞀䞪针对这䞪蜯件包的故障报告。" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "䞋列的信息可胜䌚对解决问题有所垮助" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "无法安装的蜯件包" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "将䌚安装䞋列额倖的蜯件包" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "建议安装的蜯件包" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "掚荐安装的蜯件包" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "正圚筹划升级... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "倱莥" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 msgid "Internal error, problem resolver broke stuff" msgstr "内郚错误problem resolver 坏事了" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "芁䞋蜜源代码必须指定至少䞀䞪对应的蜯件包" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "无法扟到䞎 %s 对应的源代码包" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "応略已䞋蜜过的文件“%s”\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "悚圚 %s 䞊没有足借的空䜙空闎" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需芁䞋蜜 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需芁䞋蜜 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "䞋蜜源代码 %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "有䞀些包文件无法䞋蜜。" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目圕的源代码包就䞍再解匀了\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的呜什“%s”出错。\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是吊安装了“dpkg-dev”蜯件包。\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造蜯件包呜什“%s”倱莥。\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "子进皋出错" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "芁检查生成蜯件包的构建䟝赖关系(builddeps)必须指定至少䞀䞪蜯件包" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获埗 %s 的构建䟝赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建䟝赖关系信息。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法扟到蜯件包 %3$s 因歀䞍胜满足 %2$s 所芁求的 %1$s 䟝赖关系" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1156,30 +1167,30 @@ msgstr "" "由于无法扟到笊合芁求的蜯件包 %3$s 的可甚版本因歀䞍胜满足 %2$s 所芁求的 %1" "$s 䟝赖关系" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所芁求 %1$s 䟝赖关系已安装的蜯件包 %3$s 倪新了" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所芁求 %1$s 䟝赖关系%3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "䞍胜满足蜯件包 %s 所芁求的构建䟝赖关系。" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "无法倄理构建䟝赖关系" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "被支持暡块" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1356,19 +1367,19 @@ msgstr "正圚合并现有信息" msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "tar 的校验码䞍笊包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据倎类型 %u成员 %s" @@ -1647,12 +1658,12 @@ msgstr "扟䞍到光盘。" msgid "File not found" msgstr "无法扟到该文件" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "无法讟眮文件的修改日期" @@ -1863,38 +1874,38 @@ msgstr "解析“%s:%s”时出现了某些故障 (%i)" msgid "Unable to connect to %s %s:" msgstr "䞍胜连接䞊 %s %s" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "无法解析域名“%s”" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误Acquire::gpgv::Options 的参数列衚超长。结束运行。" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内郚错误筟名正确无误䜆是无法确讀密钥的指纹(key fingerprint)" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "至少发现䞀䞪无效的筟名。" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "甚于验证筟名(悚安装了 gnupg 么)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "䞋列筟名无效\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2258,24 +2269,24 @@ msgstr "可选" msgid "extra" msgstr "额倖" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "正圚分析蜯件包的䟝赖关系树" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "生成䟝赖关系" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析蜯件包文件 %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析蜯件包文件 %s (2)" @@ -2403,12 +2414,12 @@ msgstr "获取蜯件包的枠道 %s 所需的驱劚皋序没有正垞启劚。" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s” 的碟片插入驱劚噚“%s”再按回蜊键。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "䞍支持“%s”打包系统" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2714,6 +2725,9 @@ msgstr "无法删陀 %s" msgid "Connection closed prematurely" msgstr "连接被氞久关闭" +#~ msgid "File date has changed %s" +#~ msgstr "文件 %s 的时闎已被改劚" + #~ msgid "Reading file list" #~ msgstr "正圚读取文件列衚" diff --git a/po/zh_TW.po b/po/zh_TW.po index 15d5f3cdd..6af2b24fd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-08-11 10:16+0200\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2397 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對斌 %s %s 䞊線譯圚 %s %s\n" @@ -428,115 +428,126 @@ msgstr "扟䞍到笊合的遞項" msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 猺少郚仜檔案" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB 已損毀,檔案被曎名成 %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊,嘗詊曎新 %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "無法開啟 DB 檔案 %s:%s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "檔案資料已曎改 %s" +msgid "Failed to stat %s" +msgstr "無法取埗 %s 的狀態" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "檔案沒有 control 蚘錄" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "無法取埗枞暙" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W:無法讀取目錄 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W:無法取埗 %s 狀態\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "錯誀" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "譊告" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E:套甚到檔案時出錯" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "無法解析路埑 %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "無法走蚪目錄暹" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " 移陀連結 %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "無法讀取笊號鏈接 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "無法 unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 無法將 %s 鏈接到 %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的侊限 %sB。\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "無法取埗 %s 的狀態" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "檔案無套件字笊" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s 無 override 項目\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s 無 override 項目\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s 無 override 項目\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -636,7 +647,7 @@ msgstr "無法將 %s 曎名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1516 #, c-format msgid "Regex compilation error - %s" msgstr "線譯正芏衚瀺法出錯 - %s" @@ -738,119 +749,119 @@ msgstr "刪陀 %lu 個套件及䞍曎新 %lu 個套件。\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完党安裝或刪陀完畢。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "曎正䟝存關係䞭..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr "倱敗" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "無法曎正䟝存關係。" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升玚的套件集合" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:672 msgid "You might want to run `apt-get -f install' to correct these." msgstr "甚『apt-get -f install』指什或蚱胜修正這些問題。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足盞䟝關係。詊詊看 -f 遞項。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "譊告䞋列的套件驗證倱敗" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:708 msgid "Install these packages without verification [y/N]? " msgstr "䞍驗證這些套件就盎接安裝[y/N]" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "郚仜套件無法驗證" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:719 cmdline/apt-get.cc:866 msgid "There are problems and -y was used without --force-yes" msgstr "出珟䞀些問題,悚䜿甚了 -y 遞項䜆是沒有甚 --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:772 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需芁被移陀,䜆移陀動䜜被犁止。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "內郚錯誀新增蜉移(diversion)倱敗" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1828 cmdline/apt-get.cc:1861 msgid "Unable to lock the download directory" msgstr "無法鎖定䞋茉的目錄" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1909 cmdline/apt-get.cc:2145 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取䟆源單。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:824 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:829 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需芁䞋茉 %2$sB äž­ %1$sB 的檔案。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:832 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需芁䞋茉 %sB 的檔案。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:837 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓瞮埌將消耗 %sB 的空間。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓瞮埌將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:1999 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "『%s』內沒有足倠的空間。" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:857 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足倠的空間。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:892 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然悚指定了 Trivial Only,䜆這䞍是個顯而易懂的(trivial)操䜜。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:876 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -861,28 +872,28 @@ msgstr "" "若芁繌續的話,就茞入䞋面的句子“%s”\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:882 cmdline/apt-get.cc:901 msgid "Abort." msgstr "攟棄執行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:897 msgid "Do you want to continue [Y/n]? " msgstr "繌續執行嗎 是按 [Y] 鍵吊按 [n] 鍵 " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:969 cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2042 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法䞋茉『%s』檔案。%s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "郚仜檔案無法䞋茉" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:988 cmdline/apt-get.cc:2051 msgid "Download complete and in download only mode" msgstr "䞋茉完畢,目前是“僅䞋茉”暡匏" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:994 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -890,47 +901,47 @@ msgstr "" "有幟個檔案無法䞋茉,悚可以執行 apt-get update 或者嘗詊加䞊--fix-missing \n" "遾項?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:998 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還䞍支揎 --fix-missing 和媒體眮換(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "無法曎正遺倱的套件。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "攟棄安裝。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1038 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "泚意,遞擇了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1048 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "応略 %s,它已經被安裝而䞔沒有指定芁升玚。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝所以無法刪陀。\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1077 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提䟛者是\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1089 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1094 msgid "You should explicitly select one to install." msgstr "請悚明確地遞擇䞀個䟆進行安裝。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1099 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -941,73 +952,73 @@ msgstr "" "這可胜意味著這個套件已經消倱或捚棄,\n" "或者只胜圚其他原碌䞭扟到\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "䜆是䞋列的套件將取代它" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1121 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可䟛安裝的候遞版本" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "䞍胜重新安裝 %s,因為無法䞋茉它。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未扟到“%2$s”的“%1$s”癌垃版本" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未扟到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "遞定的版本為 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1323 msgid "The update command takes no arguments" msgstr "update 指什䞍需任䜕參敞" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "無法鎖定列衚目錄" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1394 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有䞀些玢匕檔案䞍胜䞋茉,它們可胜被応略了,也可胜蜉而䜿甚了舊的玢匕檔案。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "內郚錯誀,AllUpgrade 造成錯誀" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1503 cmdline/apt-get.cc:1539 #, c-format msgid "Couldn't find package %s" msgstr "無法扟到 %s 套件。" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "泚意,根據正芏衚瀺法“%2$s”遞擇了 %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1556 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "甚『apt-get -f install』指什或蚱胜修正這些問題。" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1559 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1026,7 @@ msgstr "" "無法滿足的盞䟝關係。請嘗詊䞍指定套件明成䟆執行“apt-get -f install”(或指>\n" "定䞀個解決蟊法)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1571 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1026,7 +1037,7 @@ msgstr "" "或是悚䜿甚䞍穩定(unstable)癌行版而這些需芁的套件尚未完成\n" "或埞 Incoming 目錄移陀。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1579 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,127 +1047,127 @@ msgstr "" "該套件無法安裝,悚最奜提亀䞀個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "底䞋的資蚊有助斌解決珟圚的情況:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "䞋列的【新】套件郜將被安裝" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "掚薊(Recommended)的套件:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "籌畫升玚套件䞭..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1726 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "倱敗" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1731 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1796 cmdline/apt-get.cc:1804 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "內郚錯誀,AllUpgrade 造成錯誀" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少䞀個對應的套件才胜䞋茉源碌" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2163 #, c-format msgid "Unable to find a source package for %s" msgstr "無法扟到 %s 套件的源碌" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已經被解開到 %s 目錄的源碌檔案\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2002 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足倠的空間。" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2007 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需芁䞋茉 %2$sB äž­ %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需芁䞋茉 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "䞋茉源碌 %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "無法䞋茉某些檔案。" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碌檔案\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指什 '%s' 時倱敗。\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2105 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指什 '%s' 時倱敗。\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "子皋序倱敗" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少䞀個套件才胜檢查其建立盞䟝關係(builddeps)" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取埗 %s 的建構盞䟝關係。" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立盞䟝關係蚊息。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2240 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由斌無法扟到套件 %3$s ,因歀䞍胜滿足 %2$s 所芁求的 %1$s 盞䟝關係" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2292 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,30 +1176,30 @@ msgstr "" "由斌無法扟到笊合芁求的套件 %3$s 的可甚版本,因歀䞍胜滿足 %2$s 所芁求的 %1$s 的" "盞䟝關係" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所芁求 %1$s 盞䟝關係:已安裝的套件 %3$s 倪新了" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所芁求 %1$s 盞䟝關係:%3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2366 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所芁求的建構盞䟝關係。" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "無法處理建構盞䟝關係" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "支揎暡組:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2443 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1367,19 +1378,19 @@ msgstr "結合珟有資料䞭" msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "損毀的檔案" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum 倱敗,檔案已損毀" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 暙頭型別 %u, member 蚊息 %s" @@ -1659,12 +1670,12 @@ msgstr "扟䞍到檔案" msgid "File not found" msgstr "扟䞍到檔案" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "無法讀取資料" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "日期曎新倱敗" @@ -1874,39 +1885,39 @@ msgstr "無法解析『%s:%s (%i)』。" msgid "Unable to connect to %s %s:" msgstr "無法聯絡到䞻機『%s %s』" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "無法解析䜍眮 %s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "䞋列的【新】套件郜將被安裝" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2270,24 +2281,24 @@ msgstr "次芁" msgid "extra" msgstr "添加" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "了解套件䟝存關係䞭" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "候遞版本" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "產生套件䟝存關係" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "無法蟚識套件『%s』(1)。" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法蟚識套件『%s』(1)。" @@ -2413,12 +2424,12 @@ msgstr "" " '%s' 的光碟\n" "插入 '%s' 碟機,然埌按 [Enter] 鍵。\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體䞍支持『%s』包裝法。" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "無法明癜系統類別。" @@ -2721,6 +2732,9 @@ msgstr "無法移陀 %s" msgid "Connection closed prematurely" msgstr "連線䞍預期的結束" +#~ msgid "File date has changed %s" +#~ msgstr "檔案資料已曎改 %s" + #~ msgid "Reading file list" #~ msgstr "讀取軟件衚䞭" -- cgit v1.2.3-70-g09d2 From 6ea086805714e0dbeecfb5e3e26d3489a624bcd4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 11 Aug 2006 17:27:13 +0200 Subject: * apt-pkg/depcache.cc: - only work on instVer if we actually have one --- apt-pkg/depcache.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index bfcb8e0eb..b5b96dbcf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -680,14 +680,15 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, { bool found=false; VerIterator instVer = Pkg.CurrentVer(); - for (DepIterator D = instVer.DependsList(); D.end() != true; D++) - { - //FIXME: deal better with or-groups(?) - DepIterator LocalStart = D; - - if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) - found=true; - } + if(!instVer.end()) + for (DepIterator D = instVer.DependsList(); D.end() != true; D++) + { + //FIXME: deal better with or-groups(?) + DepIterator LocalStart = D; + + if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) + found=true; + } // this is a new dep if it was not found to be already // a important dep of the installed pacakge isNewImportantDep = !found; -- cgit v1.2.3-70-g09d2 From 308c7d30ed2e937cde65e5fed8cbf717fba113c3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 25 Aug 2006 15:39:15 +0100 Subject: initial Breaks implementation --- apt-pkg/algorithms.cc | 23 +- apt-pkg/deb/deblistparser.cc | 3 + apt-pkg/depcache.cc | 40 ++- apt-pkg/orderlist.cc | 17 +- apt-pkg/pkgcache.cc | 9 +- apt-pkg/pkgcache.h | 6 +- apt-pkg/tagfile.cc | 1 + cmdline/apt-cache.cc | 10 +- debian/changelog | 7 + doc/apt-cache.8.xml | 2 +- doc/cache.sgml | 3 +- doc/dpkg-tech.sgml | 2 + po/apt-all.pot | 760 ++++++++++++++----------------------------- 13 files changed, 344 insertions(+), 539 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index ac9d3be0b..f50c52a32 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -102,6 +102,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) DepIterator End; D.GlobOr(Start,End); if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes || End->Type == pkgCache::Dep::PreDepends) { @@ -151,6 +152,8 @@ bool pkgSimulate::Configure(PkgIterator iPkg) cout << " Obsoletes:" << D.TargetPkg().Name(); else if (D->Type == pkgCache::Dep::Conflicts) cout << " Conflicts:" << D.TargetPkg().Name(); + else if (D->Type == pkgCache::Dep::DpkgBreaks) + cout << " Breaks:" << D.TargetPkg().Name(); else cout << " Depends:" << D.TargetPkg().Name(); } @@ -651,6 +654,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) /* We let the algorithm deal with conflicts on its next iteration, it is much smarter than us */ if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes) break; @@ -873,6 +877,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) SPtrArray VList = Start.AllTargets(); if (*VList == 0 && (Flags[I->ID] & Protected) != Protected && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && Cache[I].NowBroken() == false) { @@ -903,6 +908,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (Scores[I->ID] <= Scores[Pkg->ID] || ((Cache[Start] & pkgDepCache::DepNow) == 0 && End->Type != pkgCache::Dep::Conflicts && + End->Type != pkgCache::Dep::DpkgBreaks && End->Type != pkgCache::Dep::Obsoletes)) { // Try a little harder to fix protected packages.. @@ -968,7 +974,21 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) (Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::Obsoletes)) continue; - + + if (Start->Type == pkgCache::Dep::DpkgBreaks) + { + /* Would it help if we upgraded? */ + if (Cache[End] & pkgDepCache::DepGCVer) { + if (Debug) + clog << " Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl; + Cache.MarkInstall(Pkg, false, 0, false); + continue; + } + if (Debug) + clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <ID] & Protected) != 0) continue; @@ -989,6 +1009,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Hm, nothing can possibly satisify this dep. Nuke it. if (VList[0] == 0 && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && (Flags[I->ID] & Protected) != Protected) { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index c2b26b5eb..074abea6d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -105,6 +105,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return false; if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false) return false; + if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false) + return false; if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) return false; @@ -193,6 +195,7 @@ unsigned short debListParser::VersionHash() // "Suggests", // "Recommends", "Conflicts", + "Breaks", "Replaces",0}; unsigned long Result = INIT_FCS; char S[1024]; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 78c929d62..4d193dc2e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -273,7 +273,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ if (Dep.TargetPkg() != Dep.ParentPkg() || - (Dep->Type != Dep::Conflicts && Dep->Type != Dep::Obsoletes)) + (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); // Check the base package @@ -303,7 +303,8 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) { /* Provides may never be applied against the same package if it is a conflicts. See the comment above. */ - if (P.OwnerPkg() == Pkg && Dep->Type == Dep::Conflicts) + if (P.OwnerPkg() == Pkg && + (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks)) continue; // Check if the provides is a hit @@ -457,7 +458,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) /* Invert for Conflicts. We have to do this twice to get the right sense for a conflicts group */ - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; // Add to the group if we are within an or.. @@ -468,7 +471,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -601,7 +606,9 @@ void pkgDepCache::Update(OpProgress *Prog) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -631,7 +638,9 @@ void pkgDepCache::Update(DepIterator D) State = DependencyState(D); // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; RemoveStates(D.ParentPkg()); @@ -894,7 +903,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* This bit is for processing the possibilty of an install/upgrade fixing the problem */ SPtrArray List = Start.AllTargets(); - if ((DepState[Start->ID] & DepCVer) == DepCVer) + if (Start->Type != Dep::DpkgBreaks && + (DepState[Start->ID] & DepCVer) == DepCVer) { // Right, find the best version to install.. Version **Cur = List; @@ -939,17 +949,23 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } continue; } - + /* For conflicts we just de-install the package and mark as auto, - Conflicts may not have or groups */ - if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes) + Conflicts may not have or groups. For dpkg's Breaks we try to + upgrade the package. */ + if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes || + Start->Type == Dep::DpkgBreaks) { for (Version **I = List; *I != 0; I++) { VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - MarkDelete(Pkg); + + if (Start->Type != Dep::DpkgBreaks) + MarkDelete(Pkg); + else + if (PkgState[Pkg->ID].CandidateVer != *I) + MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); } continue; } diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 8d3a97983..61d8d914e 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -491,11 +491,13 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical) continue; if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && Cache[Pkg].InstallVer != *I) continue; if ((D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes) && (Version *)Pkg.CurrentVer() != *I) continue; @@ -630,6 +632,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) /* Forward critical dependencies MUST be correct before the package can be unpacked. */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && D->Type != pkgCache::Dep::PreDepends) continue; @@ -668,7 +671,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) } return true; } - /*}}}*/ + // OrderList::DepUnPackPreD - Critical UnPacking ordering with depends /*{{{*/ // --------------------------------------------------------------------- /* Critical PreDepends (also configure immediate and essential) strives to @@ -803,9 +806,20 @@ bool pkgOrderList::DepUnPackDep(DepIterator D) return false; } else + { if (D->Type == pkgCache::Dep::Depends) if (VisitProvides(D,false) == false) return false; + + if (D->Type == pkgCache::Dep::DpkgBreaks) + { + if (CheckDep(D) == true) + continue; + + if (VisitNode(D.TargetPkg()) == false) + return false; + } + } } return true; } @@ -953,6 +967,7 @@ bool pkgOrderList::CheckDep(DepIterator D) /* Conflicts requires that all versions are not present, depends just needs one */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes) { /* Try to find something that does not have the after flag set diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 162ab4f27..35eb23dfa 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -228,8 +228,8 @@ const char *pkgCache::DepType(unsigned char Type) { const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"), _("Recommends"),_("Conflicts"),_("Replaces"), - _("Obsoletes")}; - if (Type < 8) + _("Obsoletes"),_("Breaks")}; + if (Type < sizeof(Types)/sizeof(*Types)) return Types[Type]; return ""; } @@ -292,10 +292,11 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and - conflicts. */ + conflicts (including dpkg's Breaks fields). */ bool pkgCache::DepIterator::IsCritical() { if (Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes || Dep->Type == pkgCache::Dep::Depends || Dep->Type == pkgCache::Dep::PreDepends) @@ -381,6 +382,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.ParentPkg()) continue; @@ -397,6 +399,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.OwnerPkg()) continue; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index c7a3172cc..970759492 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -66,10 +66,14 @@ class pkgCache class Namespace; // These are all the constants used in the cache structures + + // WARNING - if you change these lists you must also edit + // the stringification in pkgcache.cc and also consider whether + // the cache file will become incompatible. struct Dep { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, - Conflicts=5,Replaces=6,Obsoletes=7}; + Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8}; enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 8fcbeb23b..146829566 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -422,6 +422,7 @@ static const char *iTFRewritePackageOrder[] = { "Recommends", "Suggests", "Conflicts", + "Breaks", "Conffiles", "Filename", "Size", diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 74fa71cba..cc4c1559e 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -102,13 +102,15 @@ bool UnMet(CommandLine &CmdL) if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) + End->Type != pkgCache::Dep::Recommends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends) + End->Type != pkgCache::Dep::Depends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Verify the or group @@ -869,6 +871,7 @@ bool XVcg(CommandLine &CmdL) then show the relation but do not recurse */ if (Hit == false && (D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes)) { if (Show[D.TargetPkg()->ID] == None && @@ -890,6 +893,9 @@ bool XVcg(CommandLine &CmdL) case pkgCache::Dep::Conflicts: printf("label: \"conflicts\" color: lightgreen }\n"); break; + case pkgCache::Dep::DpkgBreaks: + printf("label: \"breaks\" color: lightgreen }\n"); + break; case pkgCache::Dep::Obsoletes: printf("label: \"obsoletes\" color: lightgreen }\n"); break; diff --git a/debian/changelog b/debian/changelog index da396e755..9c6232a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45ubuntu6~iwj) unstable; urgency=low + + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Ian Jackson Fri, 25 Aug 2006 15:39:07 +0100 + apt (0.6.45ubuntu5) edgy; urgency=low * apt-pkg/pkgcachegen.cc: diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 2779f2501..c1e65332d 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -151,7 +151,7 @@ Reverse Provides: a dependency but were not provided by any package. Missing packages may be in evidence if a full distribution is not accessed, or if a package (real or virtual) has been dropped from the distribution. Usually they - are referenced from Conflicts statements. + are referenced from Conflicts or Breaks statements. Total distinct versions is the number of package versions diff --git a/doc/cache.sgml b/doc/cache.sgml index aa87db986..e257dcd81 100644 --- a/doc/cache.sgml +++ b/doc/cache.sgml @@ -492,7 +492,7 @@ This is the parsed priority value of the package. Dependency contains the information for a single dependency record. The records are split up like this to ease processing by the client. The base of list linked list is Version.DependsList. All forms of dependencies are recorded -here including Conflicts, Suggests and Recommends. +here including Conflicts, Breaks, Suggests and Recommends.

Multiple depends on the same package must be grouped together in @@ -671,6 +671,7 @@ of them. #define pkgDEP_Recommends 4 #define pkgDEP_Conflicts 5 #define pkgDEP_Replaces 6 +#define pkgDEP_Breaks 8 diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml index 23372d71f..7c6e023dd 100644 --- a/doc/dpkg-tech.sgml +++ b/doc/dpkg-tech.sgml @@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:- productivity of the package Conflicts, to specify a package which must NOT be installed in order for the package to be configured + Breaks, to specify a package which is broken by the + package and which should therefore not be configured while broken Each of these dependencies can specify a version and a depedency on that version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available diff --git a/po/apt-all.pot b/po/apt-all.pot index 586f9e545..978b0c191 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-25 15:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 cmdline/apt-get.cc:2476 +#: cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -243,8 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 -#: apt-pkg/pkgcachegen.cc:819 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 #, c-format msgid "Unable to write to %s" msgstr "" @@ -253,301 +260,11 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 -msgid "Package extension list is too long" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 -#, c-format -msgid "Error processing directory %s" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:254 -msgid "Source extension list is too long" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:371 -msgid "Error writing header to contents file" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:401 -#, c-format -msgid "Error processing contents %s" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:556 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:762 -msgid "No selections matched" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:835 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "" - -#: ftparchive/cachedb.cc:47 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "" - -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/cachedb.cc:81 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "" - -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/cachedb.cc:242 -msgid "Archive has no control record" -msgstr "" - -#: ftparchive/cachedb.cc:448 -msgid "Unable to get a cursor" -msgstr "" - -#: ftparchive/writer.cc:79 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "" - -#: ftparchive/writer.cc:84 -#, c-format -msgid "W: Unable to stat %s\n" -msgstr "" - -#: ftparchive/writer.cc:135 -msgid "E: " -msgstr "" - -#: ftparchive/writer.cc:137 -msgid "W: " -msgstr "" - -#: ftparchive/writer.cc:144 -msgid "E: Errors apply to file " -msgstr "" - -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 -#, c-format -msgid "Failed to resolve %s" -msgstr "" - -#: ftparchive/writer.cc:173 -msgid "Tree walking failed" -msgstr "" - -#: ftparchive/writer.cc:198 -#, c-format -msgid "Failed to open %s" -msgstr "" - -#: ftparchive/writer.cc:257 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr "" - -#: ftparchive/writer.cc:265 -#, c-format -msgid "Failed to readlink %s" -msgstr "" - -#: ftparchive/writer.cc:269 -#, c-format -msgid "Failed to unlink %s" -msgstr "" - -#: ftparchive/writer.cc:276 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "" - -#: ftparchive/writer.cc:286 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "" - -#: ftparchive/writer.cc:390 -msgid "Archive had no package field" -msgstr "" - -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 -#, c-format -msgid " %s has no override entry\n" -msgstr "" - -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr "" - -#: ftparchive/writer.cc:623 -#, c-format -msgid " %s has no source override entry\n" -msgstr "" - -#: ftparchive/writer.cc:627 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr "" - -#: ftparchive/contents.cc:317 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" - -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 -msgid "realloc - Failed to allocate memory" -msgstr "" - -#: ftparchive/override.cc:38 ftparchive/override.cc:146 -#, c-format -msgid "Unable to open %s" -msgstr "" - -#: ftparchive/override.cc:64 ftparchive/override.cc:170 -#, c-format -msgid "Malformed override %s line %lu #1" -msgstr "" - -#: ftparchive/override.cc:78 ftparchive/override.cc:182 -#, c-format -msgid "Malformed override %s line %lu #2" -msgstr "" - -#: ftparchive/override.cc:92 ftparchive/override.cc:195 -#, c-format -msgid "Malformed override %s line %lu #3" -msgstr "" - -#: ftparchive/override.cc:131 ftparchive/override.cc:205 -#, c-format -msgid "Failed to read the override file %s" -msgstr "" - -#: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "" - -#: ftparchive/multicompress.cc:105 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "" - -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" - -#: ftparchive/multicompress.cc:198 -msgid "Failed to create FILE*" -msgstr "" - -#: ftparchive/multicompress.cc:201 -msgid "Failed to fork" -msgstr "" - -#: ftparchive/multicompress.cc:215 -msgid "Compress child" -msgstr "" - -#: ftparchive/multicompress.cc:238 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "" - -#: ftparchive/multicompress.cc:289 -msgid "Failed to create subprocess IPC" -msgstr "" - -#: ftparchive/multicompress.cc:324 -msgid "Failed to exec compressor " -msgstr "" - -#: ftparchive/multicompress.cc:363 -msgid "decompressor" -msgstr "" - -#: ftparchive/multicompress.cc:406 -msgid "IO to subprocess/file failed" -msgstr "" - -#: ftparchive/multicompress.cc:458 -msgid "Failed to read while computing MD5" -msgstr "" - -#: ftparchive/multicompress.cc:475 -#, c-format -msgid "Problem unlinking %s" -msgstr "" - -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "" - #: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1588 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -646,118 +363,118 @@ msgstr "" msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1907 cmdline/apt-get.cc:1940 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1988 cmdline/apt-get.cc:2224 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2078 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -765,74 +482,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2121 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2130 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -840,97 +557,97 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1426 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1451 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1454 cmdline/apt-get.cc:1656 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1458 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1477 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 +#: cmdline/apt-get.cc:1575 cmdline/apt-get.cc:1611 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1584 +#: cmdline/apt-get.cc:1598 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1628 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1617 +#: cmdline/apt-get.cc:1631 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1643 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -938,159 +655,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1637 +#: cmdline/apt-get.cc:1651 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1659 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1676 +#: cmdline/apt-get.cc:1690 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1765 +#: cmdline/apt-get.cc:1779 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1780 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1786 +#: cmdline/apt-get.cc:1800 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1803 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1808 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 +#: cmdline/apt-get.cc:1875 cmdline/apt-get.cc:1883 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1983 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2013 cmdline/apt-get.cc:2242 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2043 +#: cmdline/apt-get.cc:2057 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2067 +#: cmdline/apt-get.cc:2081 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2072 +#: cmdline/apt-get.cc:2086 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2089 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2081 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2126 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2166 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2167 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2170 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2189 +#: cmdline/apt-get.cc:2203 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2205 +#: cmdline/apt-get.cc:2219 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2233 +#: cmdline/apt-get.cc:2247 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:2267 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2319 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2357 +#: cmdline/apt-get.cc:2371 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2406 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2417 +#: cmdline/apt-get.cc:2431 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2431 +#: cmdline/apt-get.cc:2445 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2449 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2481 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2522 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1320,6 +1037,17 @@ msgstr "" msgid "The diversion path is too long" msgstr "" +#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210 +#: apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#, c-format +msgid "Failed to stat %s" +msgstr "" + +#: apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "" + #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" @@ -1375,9 +1103,7 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 apt-pkg/pkgcachegen.cc:752 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 #: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 #: apt-pkg/pkgcachegen.cc:949 msgid "Reading package lists" @@ -1851,7 +1577,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 apt-pkg/contrib/strutl.cc:981 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@ -2048,72 +1774,76 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:153 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 apt-pkg/pkgcache.cc:158 +#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:231 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243 +#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243 +#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "" @@ -2183,7 +1913,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 apt-pkg/cdrom.cc:450 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2216,19 +1946,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:245 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1075 +#: apt-pkg/algorithms.cc:1096 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1077 +#: apt-pkg/algorithms.cc:1098 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2269,12 +1999,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:122 apt-pkg/init.cc:125 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:138 apt-pkg/init.cc:141 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2317,73 +2047,86 @@ msgstr "" msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:131 apt-pkg/pkgcachegen.cc:134 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:152 apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:156 apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:190 apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:194 apt-pkg/pkgcachegen.cc:225 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:255 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:212 apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:215 apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:243 apt-pkg/pkgcachegen.cc:292 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:256 apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:262 apt-pkg/pkgcachegen.cc:311 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:577 apt-pkg/pkgcachegen.cc:682 +#: apt-pkg/pkgcachegen.cc:682 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:662 apt-pkg/pkgcachegen.cc:767 +#: apt-pkg/pkgcachegen.cc:767 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 #: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 msgid "IO Error saving source cache" msgstr "" @@ -2393,36 +2136,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 -#: apt-pkg/acquire-item.cc:980 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:980 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:646 apt-pkg/acquire-item.cc:675 +#: apt-pkg/acquire-item.cc:675 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:759 apt-pkg/acquire-item.cc:788 +#: apt-pkg/acquire-item.cc:788 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:818 apt-pkg/acquire-item.cc:847 +#: apt-pkg/acquire-item.cc:847 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:854 apt-pkg/acquire-item.cc:883 +#: apt-pkg/acquire-item.cc:883 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:941 apt-pkg/acquire-item.cc:970 +#: apt-pkg/acquire-item.cc:970 msgid "Size mismatch" msgstr "" @@ -2431,93 +2173,94 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:531 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:540 -#: apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:565 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 apt-pkg/cdrom.cc:737 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 apt-pkg/cdrom.cc:753 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 apt-pkg/cdrom.cc:757 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 apt-pkg/cdrom.cc:783 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 apt-pkg/cdrom.cc:792 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 apt-pkg/cdrom.cc:832 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2572,27 +2315,10 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:157 -#, c-format -msgid "Error occured while processing %s (NewFileDesc1)" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:249 -#, c-format -msgid "Error occured while processing %s (NewFileDesc2)" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:261 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: apt-pkg/cdrom.cc:673 -#, c-format -msgid "" -"Found %i package indexes, %i source indexes, %i translation indexes and %i " -"signatures\n" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" msgstr "" -- cgit v1.2.3-70-g09d2 From 1d7229332a7707e9abb341a7ce75ce332df54420 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Sep 2006 11:48:07 +0200 Subject: * apt-pkg/depcache.cc: - added "APT::Install-Recommends-Section" option --- apt-pkg/depcache.cc | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index b5b96dbcf..422343e4a 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -681,6 +681,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, bool found=false; VerIterator instVer = Pkg.CurrentVer(); if(!instVer.end()) + { for (DepIterator D = instVer.DependsList(); D.end() != true; D++) { //FIXME: deal better with or-groups(?) @@ -689,9 +690,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) found=true; } - // this is a new dep if it was not found to be already - // a important dep of the installed pacakge - isNewImportantDep = !found; + // this is a new dep if it was not found to be already + // a important dep of the installed pacakge + isNewImportantDep = !found; + } } if(isNewImportantDep) if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) @@ -902,8 +904,22 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) { if(Dep.IsCritical()) return true; - else if(Dep->Type == pkgCache::Dep::Recommends) - return _config->FindB("APT::Install-Recommends", false); + else if(Dep->Type == pkgCache::Dep::Recommends) + { + if ( _config->FindB("APT::Install-Recommends", false)) + return true; + // we suport a special mode to only install-recommends for certain + // sections + // FIXME: this is a meant as a temporarly solution until the + // recommends are cleaned up + string s = _config->Find("APT::Install-Recommends-Section",""); + if(s.size() > 0) + { + const char *sec = Dep.TargetPkg().Section(); + if (sec && strcmp(sec, s.c_str()) == 0) + return true; + } + } else if(Dep->Type == pkgCache::Dep::Suggests) return _config->FindB("APT::Install-Suggests", false); -- cgit v1.2.3-70-g09d2 From 320854985be0fe14491385ca349783ab8a9d7797 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 21 Sep 2006 02:02:13 +0200 Subject: * apt-pkg/depcache.cc: - do not change the auto-flag in MarkKeep() to prevent side-effects in interactive package managers when a package is marked for remove first and then unmarked again. the old code removed the auto-flag, the new code will retain this information - a package can be garbage even if it is already marked for removal --- apt-pkg/depcache.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 369eae70b..2bae94026 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -701,9 +701,18 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) // We dont even try to keep virtual packages.. if (Pkg->VersionList == 0) return; - + +#if 0 // reseting the autoflag here means we lose the + // auto-mark information if a user selects a package for removal + // but changes his mind then and sets it for keep again + // - this makes sense as default when all Garbage dependencies + // are automatically marked for removal (as aptitude does). + // setting a package for keep then makes it no longer autoinstalled + // for all other use-case this action is rather suprising if(FromUser && !P.Marked) P.Flags &= ~Flag::Auto; +#endif + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -1265,8 +1274,7 @@ bool pkgDepCache::Sweep() StateCache &state=PkgState[p->ID]; // if it is not marked and it is installed, it's garbage - if(!state.Marked && (!p.CurrentVer().end() || state.Install()) && - !state.Delete()) + if(!state.Marked && (!p.CurrentVer().end() || state.Install())) { state.Garbage=true; if(_config->FindB("Debug::pkgAutoRemove",false)) -- cgit v1.2.3-70-g09d2 From 1350057372b095f718c0073a704f2c1960c04c81 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 16:16:54 +0200 Subject: * removed the pragma mess --- apt-inst/contrib/arfile.h | 3 --- apt-inst/contrib/extracttar.h | 4 --- apt-inst/database.h | 1 - apt-inst/deb/debfile.h | 3 --- apt-inst/deb/dpkgdb.h | 3 --- apt-inst/dirstream.h | 1 - apt-inst/extract.h | 1 - apt-inst/filelist.h | 4 +-- apt-pkg/acquire-item.h | 3 --- apt-pkg/acquire-method.h | 3 --- apt-pkg/acquire-worker.h | 3 --- apt-pkg/acquire.h | 3 --- apt-pkg/algorithms.h | 3 --- apt-pkg/cachefile.h | 3 --- apt-pkg/cacheiterators.h | 3 --- apt-pkg/cdrom.h | 3 --- apt-pkg/clean.h | 3 --- apt-pkg/contrib/cdromutl.h | 4 --- apt-pkg/contrib/cmndline.h | 4 +-- apt-pkg/contrib/configuration.h | 4 +-- apt-pkg/contrib/crc-16.h | 4 --- apt-pkg/contrib/error.h | 4 +-- apt-pkg/contrib/fileutl.h | 1 - apt-pkg/contrib/hashes.h | 1 - apt-pkg/contrib/md5.h | 3 --- apt-pkg/contrib/mmap.h | 1 - apt-pkg/contrib/progress.h | 1 - apt-pkg/contrib/sha1.h | 4 --- apt-pkg/contrib/sha256.h | 4 --- apt-pkg/contrib/strutl.h | 4 +-- apt-pkg/deb/debindexfile.h | 4 +-- apt-pkg/deb/debmetaindex.h | 4 --- apt-pkg/deb/debrecords.h | 4 --- apt-pkg/deb/debsrcrecords.h | 3 --- apt-pkg/deb/debsystem.h | 4 --- apt-pkg/deb/debversion.h | 4 +-- apt-pkg/deb/dpkgpm.h | 4 --- apt-pkg/depcache.cc | 3 --- apt-pkg/depcache.h | 3 --- apt-pkg/indexfile.h | 3 --- apt-pkg/indexrecords.h | 1 - apt-pkg/metaindex.h | 3 --- apt-pkg/orderlist.h | 3 --- apt-pkg/packagemanager.h | 3 --- apt-pkg/pkgcache.cc | 5 ---- apt-pkg/pkgcache.h | 3 --- apt-pkg/pkgcachegen.h | 3 --- apt-pkg/pkgrecords.h | 3 --- apt-pkg/pkgsystem.h | 3 --- apt-pkg/policy.h | 3 --- apt-pkg/sourcelist.h | 3 --- apt-pkg/srcrecords.h | 3 --- apt-pkg/tagfile.h | 3 --- apt-pkg/vendor.h | 3 --- apt-pkg/vendorlist.h | 3 --- apt-pkg/version.h | 3 --- apt-pkg/versionmatch.h | 3 --- debian/changelog | 2 +- ftparchive/apt-ftparchive.h | 1 - ftparchive/cachedb.h | 4 +-- ftparchive/multicompress.h | 4 +-- ftparchive/override.h | 4 +-- ftparchive/writer.h | 1 - po/apt-all.pot | 56 ++++++++++++++++++++--------------------- 64 files changed, 39 insertions(+), 206 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 6c54d3e6b..96e18bc60 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -15,9 +15,6 @@ #ifndef PKGLIB_ARFILE_H #define PKGLIB_ARFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/arfile.h" -#endif #include #include diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 6daf00a27..42f8ef534 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -14,10 +14,6 @@ #ifndef PKGLIB_EXTRACTTAR_H #define PKGLIB_EXTRACTTAR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extracttar.h" -#endif - #include #include diff --git a/apt-inst/database.h b/apt-inst/database.h index 0972d40cd..854ba1fbb 100644 --- a/apt-inst/database.h +++ b/apt-inst/database.h @@ -22,7 +22,6 @@ #define PKGLIB_DATABASE_H #ifdef __GNUG__ -#pragma interface "apt-pkg/database.h" #endif #include diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index d89b85268..6b9f8ffc8 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -23,9 +23,6 @@ #ifndef PKGLIB_DEBFILE_H #define PKGLIB_DEBFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debfile.h" -#endif #include #include diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h index ddbb6d6f2..125845f96 100644 --- a/apt-inst/deb/dpkgdb.h +++ b/apt-inst/deb/dpkgdb.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_DPKGDB_H #define PKGLIB_DPKGDB_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgdb.h" -#endif #include diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index dfb480bd4..232a39f9d 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -26,7 +26,6 @@ #define PKGLIB_DIRSTREAM_H #ifdef __GNUG__ -#pragma interface "apt-pkg/dirstream.h" #endif class pkgDirStream diff --git a/apt-inst/extract.h b/apt-inst/extract.h index a9152a26f..713e39433 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -18,7 +18,6 @@ #define PKGLIB_EXTRACT_H #ifdef __GNUG__ -#pragma interface "apt-pkg/extract.h" #endif #include diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 7536a2f63..86766254f 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -28,9 +28,7 @@ #ifndef PKGLIB_FILELIST_H #define PKGLIB_FILELIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/filelist.h" -#endif + #include diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index da1bea801..b47e198d8 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -27,9 +27,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-item.h" -#endif // Item to acquire class pkgAcquire::Item diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index f46209d12..1c0b9f67c 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -16,9 +16,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-method.h" -#endif class Hashes; class pkgAcqMethod diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 6e1952202..d5f8c63d2 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -14,9 +14,6 @@ #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-worker.h" -#endif // Interfacing to the method process class pkgAcquire::Worker diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 27bb3d363..6e836ac49 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -38,9 +38,6 @@ using std::vector; using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire.h" -#endif #include #include diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index b95218061..b72874d8e 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -30,9 +30,6 @@ #ifndef PKGLIB_ALGORITHMS_H #define PKGLIB_ALGORITHMS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/algorithms.h" -#endif #include #include diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index a128c29ab..d23841e5e 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -17,9 +17,6 @@ #ifndef PKGLIB_CACHEFILE_H #define PKGLIB_CACHEFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cachefile.h" -#endif #include diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 2b326bd65..c412eaa97 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cacheiterators.h" -#endif // Package Iterator class pkgCache::PkgIterator diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 085eb64e2..b8b208c30 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -5,9 +5,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdrom.h" -#endif using namespace std; diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index 43164e250..2aee2bf54 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -10,9 +10,6 @@ #ifndef APTPKG_CLEAN_H #define APTPKG_CLEAN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/clean.h" -#endif #include diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 3180a03c7..1264982a8 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -14,10 +14,6 @@ using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdromutl.h" -#endif - bool MountCdrom(string Path); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 8f461296f..fad6d1da9 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,9 +44,7 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cmndline.h" -#endif + #include diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0d4078dab..2534692a3 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -28,9 +28,7 @@ #ifndef PKGLIB_CONFIGURATION_H #define PKGLIB_CONFIGURATION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/configuration.h" -#endif + #include #include diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h index 757104c54..f30678bac 100644 --- a/apt-pkg/contrib/crc-16.h +++ b/apt-pkg/contrib/crc-16.h @@ -10,10 +10,6 @@ #ifndef APTPKG_CRC16_H #define APTPKG_CRC16_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/crc-16.h" -#endif - #define INIT_FCS 0xffff unsigned short AddCRC16(unsigned short fcs, void const *buf, unsigned long len); diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a5fc1a223..a3be6a575 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -40,9 +40,7 @@ #ifndef PKGLIB_ERROR_H #define PKGLIB_ERROR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/error.h" -#endif + #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 041aa3309..fcb26938f 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -22,7 +22,6 @@ #define PKGLIB_FILEUTL_H #ifdef __GNUG__ -#pragma interface "apt-pkg/fileutl.h" #endif #include diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index eefa7bf41..263854054 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -14,7 +14,6 @@ #define APTPKG_HASHES_H #ifdef __GNUG__ -#pragma interface "apt-pkg/hashes.h" #endif #include diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index e280d714e..247b3fab9 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -23,9 +23,6 @@ #ifndef APTPKG_MD5_H #define APTPKG_MD5_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/md5.h" -#endif #include #include diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index e329b167a..46a3f2990 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -26,7 +26,6 @@ #define PKGLIB_MMAP_H #ifdef __GNUG__ -#pragma interface "apt-pkg/mmap.h" #endif #include diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 20caf4cdf..3f87f4d3a 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -22,7 +22,6 @@ #define PKGLIB_PROGRESS_H #ifdef __GNUG__ -#pragma interface "apt-pkg/progress.h" #endif #include diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index db8ca7893..010ef802e 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -14,10 +14,6 @@ #ifndef APTPKG_SHA1_H #define APTPKG_SHA1_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha1.h" -#endif - #include #include diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 9e88f5ece..01b638d56 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -14,10 +14,6 @@ #ifndef APTPKG_SHA256_H #define APTPKG_SHA256_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha256.h" -#endif - #include #include #include diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 6ec2b7811..b8553ab58 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -16,9 +16,7 @@ #ifndef STRUTL_H #define STRUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/strutl.h" -#endif + #include #include diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index a1b9583a4..2bc963567 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -16,9 +16,7 @@ #ifndef PKGLIB_DEBINDEXFILE_H #define PKGLIB_DEBINDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debindexfile.h" -#endif + #include diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 2b9922987..c021a1b5a 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -2,10 +2,6 @@ #ifndef PKGLIB_DEBMETAINDEX_H #define PKGLIB_DEBMETAINDEX_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debmetaindex.h" -#endif - #include #include diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index efef2e588..3f1956164 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -14,10 +14,6 @@ #ifndef PKGLIB_DEBRECORDS_H #define PKGLIB_DEBRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debrecords.h" -#endif - #include #include diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index f899993df..51e063812 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -11,9 +11,6 @@ #ifndef PKGLIB_DEBSRCRECORDS_H #define PKGLIB_DEBSRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsrcrecords.h" -#endif #include #include diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 84e57e74a..5f9995e5d 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -10,10 +10,6 @@ #ifndef PKGLIB_DEBSYSTEM_H #define PKGLIB_DEBSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsystem.h" -#endif - #include class debStatusIndex; diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index 00a8832a8..56fb67887 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -12,9 +12,7 @@ #ifndef PKGLIB_DEBVERSION_H #define PKGLIB_DEBVERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debversion.h" -#endif + #include diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 2ff8a9ac7..45eb6b15b 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -10,10 +10,6 @@ #ifndef PKGLIB_DPKGPM_H #define PKGLIB_DPKGPM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgpm.h" -#endif - #include #include #include diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 58d1d25e5..70bc9f086 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -8,9 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/depcache.h" -#endif #include #include #include diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6d51920e9..929fe93c9 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -38,9 +38,6 @@ #ifndef PKGLIB_DEPCACHE_H #define PKGLIB_DEPCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/depcache.h" -#endif #include #include diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 61049f4bd..f1c0268b8 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -21,9 +21,6 @@ #ifndef PKGLIB_INDEXFILE_H #define PKGLIB_INDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/indexfile.h" -#endif #include #include diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 414faceaa..73c8b4c02 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -6,7 +6,6 @@ #define PKGLIB_INDEXRECORDS_H #ifdef __GNUG__ -#pragma interface "apt-pkg/indexrecords.h" #endif #include #include diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 8ebf23541..2b87d7da9 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -1,9 +1,6 @@ #ifndef PKGLIB_METAINDEX_H #define PKGLIB_METAINDEX_H -/* #ifdef __GNUG__ */ -/* #pragma interface "apt-pkg/metaindex.h" */ -/* #endif */ #include #include diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h index d13301bcf..bbceb3879 100644 --- a/apt-pkg/orderlist.h +++ b/apt-pkg/orderlist.h @@ -16,9 +16,6 @@ #ifndef PKGLIB_ORDERLIST_H #define PKGLIB_ORDERLIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/orderlist.h" -#endif #include diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index f64637d03..35cdca913 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -23,9 +23,6 @@ #ifndef PKGLIB_PACKAGEMANAGER_H #define PKGLIB_PACKAGEMANAGER_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/packagemanager.h" -#endif #include #include diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 9926befe9..5672e60a4 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -20,11 +20,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgcache.h" -#pragma implementation "apt-pkg/cacheiterators.h" -#endif - #include #include #include diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 587d97534..8e7fc252c 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcache.h" -#endif #include #include diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 9a729eea4..70616c0a8 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_PKGCACHEGEN_H #define PKGLIB_PKGCACHEGEN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcachegen.h" -#endif #include diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 08f004414..d431101fe 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -17,9 +17,6 @@ #ifndef PKGLIB_PKGRECORDS_H #define PKGLIB_PKGRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgrecords.h" -#endif #include #include diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index a7d555140..246762e0b 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -37,9 +37,6 @@ #ifndef PKGLIB_PKGSYSTEM_H #define PKGLIB_PKGSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgsystem.h" -#endif #include #include diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 40ebd3f70..d5f3b2f75 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -33,9 +33,6 @@ #ifndef PKGLIB_POLICY_H #define PKGLIB_POLICY_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/policy.h" -#endif #include #include diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 123ae6984..b9e4389ed 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -35,9 +35,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/sourcelist.h" -#endif class pkgAquire; class pkgSourceList diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 3e2112549..99cbc6060 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -13,9 +13,6 @@ #ifndef PKGLIB_SRCRECORDS_H #define PKGLIB_SRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/srcrecords.h" -#endif #include #include diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 70381ad13..05c6aa701 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_TAGFILE_H #define PKGLIB_TAGFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/tagfile.h" -#endif #include #include diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h index 033bb96e8..2d39fd15f 100644 --- a/apt-pkg/vendor.h +++ b/apt-pkg/vendor.h @@ -4,9 +4,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendor.h" -#endif using std::string; diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index 7f96fc766..ff2f4ed5d 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -21,9 +21,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendorlist.h" -#endif class pkgVendorList { diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 071dba3e2..49c53a93a 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/version.h" -#endif #include #include diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index 7ca39cbe8..fe264aa46 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_VERSIONMATCH_H #define PKGLIB_VERSIONMATCH_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/versionmatch.h" -#endif #include #include diff --git a/debian/changelog b/debian/changelog index 6b842898c..6aaa473d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ apt (0.6.46.1) unstable; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- + -- Michael Vogt Mon, 2 Oct 2006 16:02:30 +0200 apt (0.6.46) unstable; urgency=low diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h index c364d670e..60bfc5408 100644 --- a/ftparchive/apt-ftparchive.h +++ b/ftparchive/apt-ftparchive.h @@ -14,7 +14,6 @@ #define APT_FTPARCHIVE_H #ifdef __GNUG__ -#pragma interface "apt-ftparchive.h" #endif #include diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index afa22213a..c10f41ecc 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,9 +12,7 @@ #ifndef CACHEDB_H #define CACHEDB_H -#ifdef __GNUG__ -#pragma interface "cachedb.h" -#endif + #include #include diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 444d8626f..a65077e73 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -16,9 +16,7 @@ #ifndef MULTICOMPRESS_H #define MULTICOMPRESS_H -#ifdef __GNUG__ -#pragma interface "multicompress.h" -#endif + #include #include diff --git a/ftparchive/override.h b/ftparchive/override.h index e64641776..f270556eb 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -12,9 +12,7 @@ #ifndef OVERRIDE_H #define OVERRIDE_H -#ifdef __GNUG__ -#pragma interface "override.h" -#endif + #include #include diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 1d47d57ec..7ae1cd587 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -14,7 +14,6 @@ #define WRITER_H #ifdef __GNUG__ -#pragma interface "writer.h" #endif #include diff --git a/po/apt-all.pot b/po/apt-all.pot index 352f2f5a6..4c354136a 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2006-10-02 15:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1490,12 +1490,12 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1742,12 +1742,12 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" @@ -2031,93 +2031,93 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:121 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:127 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:132 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:137 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:142 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:213 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:213 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:213 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:214 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:214 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:214 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:215 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:227 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:227 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:58 apt-pkg/depcache.cc:87 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:59 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:88 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -- cgit v1.2.3-70-g09d2 From c9b320e8c7c37b47aac3c8af6be990c4cded04c9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Dec 2006 11:55:43 +0100 Subject: * apt-pkg/depcache.cc: - never mark required packages as garbage --- apt-pkg/depcache.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 2bae94026..3dc9bda35 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1273,6 +1273,11 @@ bool pkgDepCache::Sweep() { StateCache &state=PkgState[p->ID]; + // skip required packages + if (!p.CurrentVer().end() && + (p.CurrentVer()->Priority == pkgCache::State::Required)) + continue; + // if it is not marked and it is installed, it's garbage if(!state.Marked && (!p.CurrentVer().end() || state.Install())) { -- cgit v1.2.3-70-g09d2 From 92b9551f03035f5a875a44588a318773f652da6a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 11:45:33 +0100 Subject: * apt-pkg/depcache.cc: - added APT::Never-MarkAuto-Section variable - that will consider dependencies of packages in this section manual --- apt-pkg/depcache.cc | 17 ++++++- doc/examples/configure-index | 2 + po/apt-all.pot | 112 ++++++++++++++++++++++--------------------- 3 files changed, 76 insertions(+), 55 deletions(-) (limited to 'apt-pkg/depcache.cc') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3dc9bda35..f5673dd5d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -907,7 +907,22 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << "Installing " << InstPkg.Name() << " as dep of " << Pkg.Name() << std::endl; - MarkInstall(InstPkg, true, Depth + 1, false); + // now check if we should consider it a automatic dependency or not + string sec = _config->Find("APT::Never-MarkAuto-Section",""); + if(Pkg.Section() && (string(Pkg.Section()) == sec)) + { + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl; + MarkInstall(InstPkg,true,Depth + 1, true); + } + else + { + // mark automatic dependency + MarkInstall(InstPkg,true,Depth + 1, false); + // Set the autoflag, after MarkInstall because MarkInstall unsets it + if (P->CurrentVer == 0) + PkgState[InstPkg->ID].Flags |= Flag::Auto; + } } continue; } diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 1911d091b..32b7168a0 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -94,6 +94,8 @@ APT Cache-Limit "4194304"; Default-Release ""; + // consider dependencies of packages in this section manual + Never-MarkAuto-Section "metapackages"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; diff --git a/po/apt-all.pot b/po/apt-all.pot index 0a7a30629..0dc932d47 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-06 18:58+0200\n" +"POT-Creation-Date: 2007-03-14 11:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2455 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2463 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1577 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -705,11 +705,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1886 cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1894 cmdline/apt-get.cc:1927 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1975 cmdline/apt-get.cc:2211 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2057 +#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2065 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2100 +#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2108 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2117 msgid "Download complete and in download only mode" msgstr "" @@ -887,55 +887,59 @@ msgid "" "used instead." msgstr "" -#: cmdline/apt-get.cc:1402 +#: cmdline/apt-get.cc:1406 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1427 +#: cmdline/apt-get.cc:1433 msgid "" -"The following packages where automatically installed and are no longer " +"The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1432 +#: cmdline/apt-get.cc:1435 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1435 cmdline/apt-get.cc:1637 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1645 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1439 +#: cmdline/apt-get.cc:1447 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1458 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1556 cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1564 cmdline/apt-get.cc:1600 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1579 +#: cmdline/apt-get.cc:1587 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1609 +#: cmdline/apt-get.cc:1617 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1620 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -943,159 +947,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1632 +#: cmdline/apt-get.cc:1640 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1640 +#: cmdline/apt-get.cc:1648 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1669 +#: cmdline/apt-get.cc:1677 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1766 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1759 +#: cmdline/apt-get.cc:1767 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1779 +#: cmdline/apt-get.cc:1787 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1782 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1790 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1795 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1854 cmdline/apt-get.cc:1862 +#: cmdline/apt-get.cc:1862 cmdline/apt-get.cc:1870 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1962 +#: cmdline/apt-get.cc:1970 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2000 cmdline/apt-get.cc:2229 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2036 +#: cmdline/apt-get.cc:2044 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2068 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2073 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2076 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2074 +#: cmdline/apt-get.cc:2082 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2113 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2133 +#: cmdline/apt-get.cc:2141 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2145 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2163 +#: cmdline/apt-get.cc:2171 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2190 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2198 +#: cmdline/apt-get.cc:2206 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2226 +#: cmdline/apt-get.cc:2234 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2246 +#: cmdline/apt-get.cc:2254 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2306 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2350 +#: cmdline/apt-get.cc:2358 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2432 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2428 +#: cmdline/apt-get.cc:2436 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2460 +#: cmdline/apt-get.cc:2468 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2509 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2206,7 +2210,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:403 #, c-format msgid "" "This installation run will require temporarily removing the essential " -- cgit v1.2.3-70-g09d2