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 --- cmdline/apt-get.cc | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6268f4953..31148a807 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -58,6 +58,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -992,6 +993,26 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, cerr << _("Unable to correct missing packages.") << endl; 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; + } + } + // ---------------------------------------------------------- _system->UnLock(); pkgPackageManager::OrderResult Res = PM->DoInstall(); @@ -1375,6 +1396,135 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// RecurseDirty - Mark used packages as dirty /*{{{*/ +// --------------------------------------------------------------------- +/* Mark all reachable packages as dirty. */ +void RecurseDirty (CacheFile &Cache, pkgCache::PkgIterator Pkg, pkgCache::State::PkgRemoveState DirtLevel) +{ + // 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) + { +// fprintf(stdout,"This one is not installed/virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); + return; + } + + // 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); + 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); + 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) + { +// fprintf(stdout,"We don't need %s %d %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel, Cache[Pkg].Dirty()); + return; + } + + // 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) + { +// fprintf(stdout,"We are virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); + for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); ! Prv.end(); ++Prv) + RecurseDirty (Cache, Prv.OwnerPkg(), DirtLevel); + return; + } + + // 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()); + + switch(D->Type) + { + case pkgCache::Dep::Depends: + case pkgCache::Dep::PreDepends: + RecurseDirty (Cache, D.TargetPkg(), pkgCache::State::RemoveRequired); + break; + case pkgCache::Dep::Recommends: + RecurseDirty (Cache, D.TargetPkg(), pkgCache::State::RemoveRecommended); + break; + case pkgCache::Dep::Suggests: + RecurseDirty (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; + } + } +// fprintf(stdout,"We keep %s %d %d \n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); +} + /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + std::cout << "DoAutomaticRemove()" << std::endl; + 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->FindB("APT::Get::Remove",true) == false) + return _error->Error(_("We are not supposed to delete stuff, can't start AutoRemover")); + + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + Cache->SetDirty(Pkg, pkgCache::State::RemoveUnknown); + + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + RecurseDirty (Cache, Pkg, pkgCache::State::RemoveManual); + + + + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (! Cache[Pkg].Dirty() && + (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && Cache[Pkg].Delete() == false)) + { + fprintf(stdout,"We could delete %s %d\n", Pkg.Name(), Cache[Pkg].AutomaticRemove); + Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } + } + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) + { + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); + } + return true; +} + /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1546,6 +1696,11 @@ bool DoInstall(CommandLine &CmdL) return _error->Error(_("Broken packages")); } + //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 */ if (Cache->InstCount() != ExpectedInst) @@ -1565,6 +1720,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; + //if (_config->FindB("APT::Get::AutomaticRemove")) + Cache[I].AutomaticRemove = pkgCache::State::RemoveRequired; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -2410,6 +2567,7 @@ void GetInitialize() _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@ -2465,6 +2623,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,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, -- cgit v1.2.3 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 'cmdline') 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 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 'cmdline') 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 From d36ab88eb8a5e490e4a817b87f20cb3f890e0da1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Jun 2005 09:58:47 +0000 Subject: * write the state file after a successfull commit from the pkgManager --- apt-pkg/packagemanager.cc | 5 +++++ cmdline/apt-get.cc | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a08ccd602..a97c94fdf 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -637,6 +637,11 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall() 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/cmdline/apt-get.cc b/cmdline/apt-get.cc index bc8cd1ae5..f1496c9e2 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -994,9 +994,6 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Error(_("Aborting install.")); } - // -- we do it here because there is no libapt::Commit() :/ - Cache->writeStateFile(NULL); - _system->UnLock(); pkgPackageManager::OrderResult Res = PM->DoInstall(); if (Res == pkgPackageManager::Failed || _error->PendingError() == true) -- cgit v1.2.3 From db1e7193fa7d5b86656c05112b9d6ad6e75845b8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Jun 2005 12:34:34 +0000 Subject: * moved the importend algorithm to algorithm.h as "pkgMarkUsed()" --- apt-pkg/algorithms.cc | 104 ++++++++++++++++++++++++++++++++++++ apt-pkg/algorithms.h | 4 ++ cmdline/apt-get.cc | 144 ++++++++++---------------------------------------- 3 files changed, 136 insertions(+), 116 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 2799c2fdd..98bd8dd8b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1243,3 +1243,107 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) qsort(List,Count,sizeof(*List),PrioComp); } /*}}}*/ + + +// pkgMarkPkgUsed - Mark used packages as dirty /*{{{*/ +// --------------------------------------------------------------------- +/* Mark all reachable packages as dirty. */ +void pkgMarkPkgUsed(pkgDepCache &Cache, pkgCache::PkgIterator Pkg, + pkgCache::State::PkgRemoveState DirtLevel) +{ + // 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) + { +// fprintf(stdout,"This one is not installed/virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); + return; + } + + // 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); + 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); + 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) + { +// fprintf(stdout,"We don't need %s %d %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel, Cache[Pkg].Dirty()); + return; + } + + // 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) + { +// 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; + } + + // 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()); + + switch(D->Type) + { + 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; + } + } +// fprintf(stdout,"We keep %s %d %d \n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); +} + /*}}}*/ + +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; + + // 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); + + + return true; +} diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 174a7f58d..210127ab9 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -132,5 +132,9 @@ bool pkgAllUpgrade(pkgDepCache &Cache); bool pkgMinimizeUpgrade(pkgDepCache &Cache); void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List); + +// mark all reachable packages, everything that is not reach can +// be removed +bool pkgMarkUsed(pkgDepCache &Cache); #endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f1496c9e2..54479e224 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1354,106 +1354,6 @@ bool DoUpdate(CommandLine &CmdL) return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); return true; -} - /*}}}*/ -// DoUpgrade - Upgrade all packages /*{{{*/ -// --------------------------------------------------------------------- -/* Upgrade all packages without installing new packages or erasing old - packages */ -bool DoUpgrade(CommandLine &CmdL) -{ - CacheFile Cache; - if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) - return false; - - // Do the upgrade - if (pkgAllUpgrade(Cache) == false) - { - ShowBroken(c1out,Cache,false); - return _error->Error(_("Internal error, AllUpgrade broke stuff")); - } - - return InstallPackages(Cache,true); -} - /*}}}*/ -// RecurseDirty - Mark used packages as dirty /*{{{*/ -// --------------------------------------------------------------------- -/* Mark all reachable packages as dirty. */ -void RecurseDirty (CacheFile &Cache, pkgCache::PkgIterator Pkg, pkgCache::State::PkgRemoveState DirtLevel) -{ - // 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) - { -// fprintf(stdout,"This one is not installed/virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); - return; - } - - // 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); - 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); - 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) - { -// fprintf(stdout,"We don't need %s %d %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel, Cache[Pkg].Dirty()); - return; - } - - // 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) - { -// fprintf(stdout,"We are virtual %s %d %d\n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); - for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); ! Prv.end(); ++Prv) - RecurseDirty (Cache, Prv.OwnerPkg(), DirtLevel); - return; - } - - // 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()); - - switch(D->Type) - { - case pkgCache::Dep::Depends: - case pkgCache::Dep::PreDepends: - RecurseDirty (Cache, D.TargetPkg(), pkgCache::State::RemoveRequired); - break; - case pkgCache::Dep::Recommends: - RecurseDirty (Cache, D.TargetPkg(), pkgCache::State::RemoveRecommended); - break; - case pkgCache::Dep::Suggests: - RecurseDirty (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; - } - } -// fprintf(stdout,"We keep %s %d %d \n", Pkg.Name(), Pkg->AutomaticRemove, DirtLevel); } /*}}}*/ // DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ @@ -1462,30 +1362,23 @@ void RecurseDirty (CacheFile &Cache, pkgCache::PkgIterator Pkg, pkgCache::State: bool DoAutomaticRemove(CacheFile &Cache) { std::cout << "DoAutomaticRemove()" << std::endl; - 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->FindB("APT::Get::Remove",true) == false) - return _error->Error(_("We are not supposed to delete stuff, can't start AutoRemover")); - - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) - Cache->SetDirty(Pkg, pkgCache::State::RemoveUnknown); - - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) - RecurseDirty (Cache, Pkg, pkgCache::State::RemoveManual); - + 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].Dirty() && - (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && Cache[Pkg].Delete() == false)) + (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 %d\n", + Pkg.Name(), Cache[Pkg].AutomaticRemove); Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); } } @@ -1503,6 +1396,25 @@ bool DoAutomaticRemove(CacheFile &Cache) return _error->Error(_("Internal Error, AutoRemover broke stuff")); } return true; +} +// DoUpgrade - Upgrade all packages /*{{{*/ +// --------------------------------------------------------------------- +/* Upgrade all packages without installing new packages or erasing old + packages */ +bool DoUpgrade(CommandLine &CmdL) +{ + CacheFile Cache; + if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) + return false; + + // Do the upgrade + if (pkgAllUpgrade(Cache) == false) + { + ShowBroken(c1out,Cache,false); + return _error->Error(_("Internal error, AllUpgrade broke stuff")); + } + + return InstallPackages(Cache,true); } /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ -- cgit v1.2.3 From d9e050800067f16ba49cb6932d7a52a6de22ab9d Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:52:00 +0000 Subject: Merge from Debian branch Patches applied: * 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 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 --- cmdline/apt-key | 6 +++--- configure.in | 2 +- debian/apt.postinst | 2 +- debian/changelog | 12 ++++++++++++ debian/rules | 2 +- doc/fr/makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 4 ++-- share/debian-archive.gpg | Bin 477 -> 1303 bytes 8 files changed, 64 insertions(+), 10 deletions(-) (limited to 'cmdline') 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 767399b52..aa827cec1 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 57b746a56..be201057c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 + + -- 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/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/doc/fr/makefile b/doc/fr/makefile index 6544ee9e0..c0e7fa7ed 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -8,6 +8,48 @@ include ../../buildlib/defaults.mak # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ - apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 + apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ + apt-key.fr.8 + INCLUDES = apt.ent.fr -include $(XML_MANPAGE_H) + +doc: $(SOURCE) + +$(SOURCE) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XMLTO) man $< + +apt-cache.fr.8:: apt-cache.8 + cp $< $@ + +apt-get.fr.8:: apt-get.8 + cp $< $@ + +apt-cdrom.fr.8:: apt-cdrom.8 + cp $< $@ + +apt.conf.fr.5:: apt.conf.5 + cp $< $@ + +apt-config.fr.8:: apt-config.8 + cp $< $@ + +sources.list.fr.5:: sources.list.5 + cp $< $@ + +apt-sortpkgs.fr.1:: apt-sortpkgs.1 + cp $< $@ + +apt-ftparchive.fr.1:: apt-ftparchive.1 + cp $< $@ + +apt_preferences.fr.5:: apt_preferences.5 + cp $< $@ + +apt-extracttemplates.fr.1:: apt-extracttemplates.1 + cp $< $@ + +apt-key.fr.8:: apt-key.8 + cp $< $@ + + diff --git a/po/he.po b/po/he.po index e2aea1c77..242155eff 100644 --- a/po/he.po +++ b/po/he.po @@ -639,8 +639,8 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" -+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" +"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" +"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" #: cmdline/apt-get.cc:658 msgid " Done" 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 From c9fa6271e4813d88284771ff15050165eac38353 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:53:43 +0000 Subject: 0.6.38ubuntu1 --- cmdline/apt-key | 6 +++--- configure.in | 2 +- debian/apt.postinst | 2 +- debian/changelog | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 0685e36f7..be2b19a1a 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/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi diff --git a/configure.in b/configure.in index aa827cec1..2f7fd611a 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.38ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..df0433057 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/debian-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index be201057c..a249d92f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround -- cgit v1.2.3 From 99f9dc4c97a7eef6b2819c933be0fc947f747912 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 21:28:56 +0000 Subject: Merge 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-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 --- cmdline/apt-key | 6 +- debian/apt.postinst | 2 +- debian/changelog | 27 ++++ debian/control | 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 1303 -> 0 bytes 11 files changed, 499 insertions(+), 252 deletions(-) delete mode 100644 share/debian-archive.gpg (limited to 'cmdline') 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/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 d71a78e71..2ff5dd8c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +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.38ubuntu1) breezy; urgency=low * First release from Ubuntu branch @@ -20,6 +31,22 @@ apt (0.6.38) unstable; urgency=low -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +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 + +>>>>>>> MERGE-SOURCE 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 9dd271619..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -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/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 opstningen\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst.\n" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" @@ -287,7 +287,7 @@ msgstr "" "apt-extracttemplates er et vrktj til at uddrage opstnings- og skabelon-" "oplysninger fra Debianpakker\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -t Angiv temp-mappe\n" " -c=? Ls denne opstningsfil\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 hjlpetekst\n" " --md5 Styr generering af MD5\n" " -s=? Kilde-tvangsfil\n" -" -q Stille (vis frre statusbeskeder)\n" +" -q Stille\n" " -d=? Vlg den valgfrie mellemlager-database\n" -" --no-delink Aktivr \"delinking\" fejlsporingstilstand\n" -" --contents Bestem generering af inholdsfil\n" +" --no-delink Aktivr \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" " -c=? Ls denne opstningsfil\n" " -o=? St en opstnings-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 "Flgende pakker vil blive FJERNET:" +msgstr "Flgende 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: Flgende essentielle pakker vil blive fjernet\n" +"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br 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 fuldstndigt installerede eller fjernede.\n" +msgstr "%lu ikke fuldstndigt 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 - Udfr en opgradering\n" " install - Installr nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Fjern pakker\n" +" remove - Afinstallr pakker\n" " source - Hent kildetekstarkiver\n" " build-dep - St opbygningsafhngigheder op for kildetekstpakker\n" " dist-upgrade - Distributionsopgradering, se apt-get(8)\n" " dselect-upgrade - Flg 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 afhngigheder\n" "\n" "Tilvalg:\n" @@ -1283,7 +1282,7 @@ msgstr "" "apt-sortpkgs er et simpelt vrktj til at sortere pakkefiler. Tilvalget -s\n" "bruges til at angive filens type.\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -s Benyt kildefils-sortering\n" " -c=? Ls denne opstningsfil\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 tilfjelse 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 frst" #: 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 "" -"Krsel af denne installation krver midlertidig fjernelse af den essentielle " -"pakke %s grundet en afhngighedslkke. Det er ofte en drlig id, men hvis " -"du virkelig vil gre det, kan du aktivere valget 'APT::Force-LoopBreak'." +"Krsel af denne installation krver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhngighedslkke. Det er ofte en drlig " +"id, men hvis du virkelig vil gre 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 nede over det antal afhngigheder, denne APT kan hndtere." #: 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 "omdbning 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 " "ndt 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 " "ndt 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 "Strrelsen 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 gnre des fichiers d'index pour les archives Debian. Il\n" -"gre de nombreux types de gnration, d'une automatisation complte \n" +"supporte de nombreux types de gnration, d'une automatisation complte \n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive gnre les fichiers de paquets partir d'un arbre de .debs.\n" @@ -389,7 +389,7 @@ msgstr "" "des sections\n" "\n" "De faon similaire, apt-ftparchive gnre des fichiers de source partir\n" -"d'un arbre de .dscs. L'option --source-override peut tre utilise pour\n" +"d'un arbre de .dscs. L'option --source-override peut tre employe pour\n" "spcifier un fichier src d'override\n" "\n" "Les commandes packages et sources devraient tre dmarres 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 " Dlier %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 enlevs mais la dsinstallation est dsactive." +msgstr "" +"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." #: 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 "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "" +"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\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 rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "" +"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\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 problmes:" +msgstr "" +"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" #: 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 dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "" +"Les dpendances 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 "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1560,7 +1568,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: 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 rpondu: %s" +msgstr "" +"La commande %s du script de connexion a chou, le serveur a rpondu: %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 donnes, dlai de connexion dpass" +msgstr "" +"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: 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 forme dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal forme 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 forme dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal forme 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 forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal forme 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 rinstall, 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 insrer quelques adresses sources dans votre sources.list" +msgstr "" +"Vous devez insrer 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 dpass le nombre de noms de paquets que cet APT est capable " -"de traiter." +"Vous avez dpass 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 dpass le nombre de versions que cet APT est capable de " -"traiter." +"Vous avez dpass 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 dpass le nombre de dpendances que cet APT est capable de " +"Vous avez dpass le nombre de dpendances 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'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entre/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 contrle MD5 incohrente" -#: 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 incohrente" @@ -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 entirement 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 dpendances: " + +#~ 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 dpendances: " + +#~ 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 tiquets:" + +#~ 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 rpertoire %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 crer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." + +#~ 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 "Rcupration 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 insrer le disque\n" +#~ "%s\n" +#~ "dans le lecteur %s et appuyez sur la touche Entre\n" + +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "chec dans la somme de contrle 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 Nud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une dviation" + +#~ 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-tte Package:, dcalage %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 contrle 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 reconnatre ce cdrom par " +#~ "votre APT. apt-get update ne peut tre employ pour ajouter de nouveaux " +#~ "cdroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cdrom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refus notre connexion et a rpondu: %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'criture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Length invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Range invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possde un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tte de donne" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u: balise mal forme" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'tait pas prsent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le systme de version %s" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dpendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Gnration des dpendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal forme 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 Lus 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 Contedo %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 gerao, 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 contm o contedo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" "override suportado para forar 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 compilao 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 remoo 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 "Impossvel criar lock no diretrio 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 no pde 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 no 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 "Impossvel criar lock no diretrio 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 "Impossvel 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 expresso 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 "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: 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 "" "distribuio instvel, que alguns pacotes requeridos no 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 no instalvel 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 informao a seguir pode ajudar a resolver a situao:" -#: 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 sero 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 Atualizao... " -#: 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 "Impossvel 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 no possui espao 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 construo '%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 dependncias " "de construo" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\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 dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde 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 dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: 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 dependncia %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 dependncia %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 "No foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos 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 "Impossvel aceitar conexo" -#: 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 "Seleo falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Conexo expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: 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 conexo" -#: 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 cabealho ruins" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conexo 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 (NovaVerso1)" #: 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 (NovaVerso2)" #: 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 "renomeao 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 " "no 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 "" "No foi possvel 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 esto 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 deleted file mode 100644 index c391d8fa1..000000000 Binary files a/share/debian-archive.gpg and /dev/null differ -- cgit v1.2.3 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 'cmdline') 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 opstningen\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst.\n" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" @@ -287,7 +287,7 @@ msgstr "" "apt-extracttemplates er et vrktj til at uddrage opstnings- og skabelon-" "oplysninger fra Debianpakker\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -t Angiv temp-mappe\n" " -c=? Ls denne opstningsfil\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 hjlpetekst\n" " --md5 Styr generering af MD5\n" " -s=? Kilde-tvangsfil\n" -" -q Stille (vis frre statusbeskeder)\n" +" -q Stille\n" " -d=? Vlg den valgfrie mellemlager-database\n" -" --no-delink Aktivr \"delinking\" fejlsporingstilstand\n" -" --contents Bestem generering af inholdsfil\n" +" --no-delink Aktivr \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" " -c=? Ls denne opstningsfil\n" " -o=? St en opstnings-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 "Flgende pakker vil blive FJERNET:" +msgstr "Flgende 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: Flgende essentielle pakker vil blive fjernet\n" +"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br 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 fuldstndigt installerede eller fjernede.\n" +msgstr "%lu ikke fuldstndigt 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 - Udfr en opgradering\n" " install - Installr nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Fjern pakker\n" +" remove - Afinstallr pakker\n" " source - Hent kildetekstarkiver\n" " build-dep - St opbygningsafhngigheder op for kildetekstpakker\n" " dist-upgrade - Distributionsopgradering, se apt-get(8)\n" " dselect-upgrade - Flg 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 afhngigheder\n" "\n" "Tilvalg:\n" @@ -1283,7 +1282,7 @@ msgstr "" "apt-sortpkgs er et simpelt vrktj til at sortere pakkefiler. Tilvalget -s\n" "bruges til at angive filens type.\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -s Benyt kildefils-sortering\n" " -c=? Ls denne opstningsfil\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 tilfjelse 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 frst" #: 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 "" -"Krsel af denne installation krver midlertidig fjernelse af den essentielle " -"pakke %s grundet en afhngighedslkke. Det er ofte en drlig id, men hvis " -"du virkelig vil gre det, kan du aktivere valget 'APT::Force-LoopBreak'." +"Krsel af denne installation krver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhngighedslkke. Det er ofte en drlig " +"id, men hvis du virkelig vil gre 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 nede over det antal afhngigheder, denne APT kan hndtere." #: 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 "omdbning 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 " "ndt 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 " "ndt 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 "Strrelsen 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 gnre des fichiers d'index pour les archives Debian. Il\n" -"gre de nombreux types de gnration, d'une automatisation complte \n" +"supporte de nombreux types de gnration, d'une automatisation complte \n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive gnre les fichiers de paquets partir d'un arbre de .debs.\n" @@ -389,7 +389,7 @@ msgstr "" "des sections\n" "\n" "De faon similaire, apt-ftparchive gnre des fichiers de source partir\n" -"d'un arbre de .dscs. L'option --source-override peut tre utilise pour\n" +"d'un arbre de .dscs. L'option --source-override peut tre employe pour\n" "spcifier un fichier src d'override\n" "\n" "Les commandes packages et sources devraient tre dmarres 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 " Dlier %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 enlevs mais la dsinstallation est dsactive." +msgstr "" +"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." #: 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 "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "" +"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\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 rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "" +"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\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 problmes:" +msgstr "" +"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" #: 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 dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "" +"Les dpendances 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 "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1560,7 +1568,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: 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 rpondu: %s" +msgstr "" +"La commande %s du script de connexion a chou, le serveur a rpondu: %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 donnes, dlai de connexion dpass" +msgstr "" +"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: 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 forme dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal forme 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 forme dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal forme 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 forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal forme 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 rinstall, 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 insrer quelques adresses sources dans votre sources.list" +msgstr "" +"Vous devez insrer 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 dpass le nombre de noms de paquets que cet APT est capable " -"de traiter." +"Vous avez dpass 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 dpass le nombre de versions que cet APT est capable de " -"traiter." +"Vous avez dpass 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 dpass le nombre de dpendances que cet APT est capable de " +"Vous avez dpass le nombre de dpendances 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'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entre/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 contrle MD5 incohrente" -#: 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 incohrente" @@ -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 entirement 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 dpendances: " + +#~ 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 dpendances: " + +#~ 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 tiquets:" + +#~ 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 rpertoire %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 crer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." + +#~ 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 "Rcupration 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 insrer le disque\n" +#~ "%s\n" +#~ "dans le lecteur %s et appuyez sur la touche Entre\n" + +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "chec dans la somme de contrle 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 Nud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une dviation" + +#~ 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-tte Package:, dcalage %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 contrle 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 reconnatre ce cdrom par " +#~ "votre APT. apt-get update ne peut tre employ pour ajouter de nouveaux " +#~ "cdroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cdrom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refus notre connexion et a rpondu: %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'criture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Length invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Range invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possde un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tte de donne" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u: balise mal forme" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'tait pas prsent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le systme de version %s" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dpendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Gnration des dpendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal forme 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 Lus 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 Contedo %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 gerao, 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 contm o contedo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" "override suportado para forar 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 compilao 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 remoo 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 "Impossvel criar lock no diretrio 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 no pde 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 no 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 "Impossvel criar lock no diretrio 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 "Impossvel 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 expresso 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 "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: 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 "" "distribuio instvel, que alguns pacotes requeridos no 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 no instalvel 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 informao a seguir pode ajudar a resolver a situao:" -#: 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 sero 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 Atualizao... " -#: 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 "Impossvel 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 no possui espao 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 construo '%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 dependncias " "de construo" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\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 dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde 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 dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: 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 dependncia %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 dependncia %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 "No foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos 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 "Impossvel aceitar conexo" -#: 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 "Seleo falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Conexo expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: 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 conexo" -#: 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 cabealho ruins" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conexo 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 (NovaVerso1)" #: 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 (NovaVerso2)" #: 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 "renomeao 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 " "no 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 "" "No foi possvel 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 esto 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 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 'cmdline') 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 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 'cmdline') 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 From 7439e2e988e5c097f922acd04b648deb54d16122 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 15:39:49 +0000 Subject: Fix keyring path in apt-key --- cmdline/apt-key | 6 +++--- debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 0685e36f7..be2b19a1a 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/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi diff --git a/debian/changelog b/debian/changelog index cb092b803..a5f2b8960 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.39ubuntu2) breezy; urgency=low + + * Fix keyring path in apt-key (I swear I remember doing this before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + apt (0.6.39ubuntu1) breezy; urgency=low * Michael Vogt -- cgit v1.2.3 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 'cmdline') 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 From f77bf408f3f7ae650bac2a967f28610737acf1ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Aug 2005 11:59:11 +0000 Subject: * merged with apt@packages.debian.org/apt--main--0 Patches applied: * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-106 Restore lost changelog entries * apt@packages.debian.org/apt--main--0--patch-107 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-108 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1 * inital proof of concept code, understands what dpkg tells it already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2 * progress reporting works now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3 * added "APT::Status-Fd" variable * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4 * do i18n now too * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5 * define N_(x) if it is not defined already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6 * PackageManager::DoInstall(int status_fd) added (does not break the ABI) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7 * merged with apt--fixes--0 to make it build again * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8 * added support for "error" and "conffile-prompt" messages from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9 merge with main * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10 * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11 * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12 * fixed a API breakage * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13 * doc added, should be releasable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15 * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16 * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17 * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18 * clear the APT::Keep-Fds configuration when it's no longer needed * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19 * rewrote the reading from dpkg so that it never blocks * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20 * merged the two status arrays into one * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21 * added support for download progress reporting too (for Kamion and base-config) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22 * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added --- README.progress-reporting | 49 +++ apt-pkg/acquire.cc | 21 + apt-pkg/contrib/configuration.cc | 46 ++- apt-pkg/contrib/configuration.h | 7 +- apt-pkg/contrib/fileutl.cc | 24 +- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/deb/dpkgpm.cc | 213 ++++++++-- apt-pkg/deb/dpkgpm.h | 9 +- apt-pkg/packagemanager.cc | 4 +- apt-pkg/packagemanager.h | 2 +- cmdline/apt-get.cc | 22 +- configure.in | 2 +- debian/apt.manpages | 1 + debian/changelog | 300 +++++++++++--- doc/examples/configure-index | 8 + methods/gpgv.cc | 30 +- po/apt-all.pot | 28 +- po/bs.po | 130 +++--- po/ca.po | 295 ++++++++------ po/cs.po | 131 +++--- po/cy.po | 841 +++++++++++++++++++++++---------------- po/da.po | 141 +++---- po/de.po | 152 +++---- po/el.po | 157 ++++---- po/en_GB.po | 132 +++--- po/es.po | 131 +++--- po/eu.po | 121 +++--- po/fi.po | 131 +++--- po/fr.po | 266 ++++++------- po/he.po | 134 +++---- po/hu.po | 131 +++--- po/it.po | 131 +++--- po/ja.po | 131 +++--- po/ko.po | 131 +++--- po/nb.po | 131 +++--- po/nl.po | 131 +++--- po/nn.po | 131 +++--- po/pl.po | 131 +++--- po/pt.po | 165 ++++---- po/pt_BR.po | 54 +-- po/ro.po | 131 +++--- po/ru.po | 131 +++--- po/sk.po | 183 ++++----- po/sl.po | 131 +++--- po/sv.po | 131 +++--- po/tl.po | 131 +++--- po/zh_CN.po | 131 +++--- po/zh_TW.po | 131 +++--- test/conf_clear.cc | 23 ++ test/makefile | 6 + 50 files changed, 3352 insertions(+), 2574 deletions(-) create mode 100644 README.progress-reporting create mode 100644 test/conf_clear.cc (limited to 'cmdline') diff --git a/README.progress-reporting b/README.progress-reporting new file mode 100644 index 000000000..7ae514929 --- /dev/null +++ b/README.progress-reporting @@ -0,0 +1,49 @@ +Install-progress reporting +-------------------------- + +If the apt options: "APT::Status-Fd" is set, apt will send status +reports to that fd. The status information is seperated with a ':', +there are the following status conditions: + +status = {"pmstatus", "dlstatus", "conffile-prompt", "error" } + +The reason for using a fd instead of a OpProgress class is that many +apt frontend fork a (vte) terminal for the actual installation. + +The reason to do the mapping and l10n of the dpkg states to human +readable (and translatable) strings is that this way the translation +needs to be done only once for all frontends. + + +pmstatus +-------- +Status of the package manager (dpkg). This is send when packages +are installed/removed. +pmstatus:pkgname:TotalPercentage:action-description + +PkgName = the name of the package +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + + +Example: +# ./apt-get install -o APT::Status-Fd=2 3dchess >/dev/null +pmstatus:3dchess:20:Preparing 3dchess +pmstatus:3dchess:40:Unpacking 3dchess +pmstatus:3dchess:60:Preparing to configure 3dchess +pmstatus:3dchess:80:Configuring 3dchess +pmstatus:3dchess:100:Installed 3dchess + + +dlstatus +-------- +dlstatus:AlreadDownloaded:TotalPercentage:action-description + +AlreadyDownloaded = the number of already downloaded packages +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + +Example: +dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining) +dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining) +dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining) \ No newline at end of file diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 70dce4f54..62209e65b 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -803,6 +804,26 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) Time = NewTime; } + int fd = _config->FindI("APT::Status-Fd",-1); + if(fd > 0) + { + ostringstream status; + + char msg[200]; + long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems; + unsigned long ETA = + (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); + + snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + + // build the status str + status << "dlstatus:" << i + << ":" << (CurrentBytes/float(TotalBytes)*100.0) + << ":" << msg + << endl; + write(fd, status.str().c_str(), status.str().size()); + } + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 69f8d1dca..4b2c0fbb5 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -325,6 +325,47 @@ void Configuration::Set(const char *Name,int Value) char S[300]; snprintf(S,sizeof(S),"%i",Value); Itm->Value = S; +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, int Value) +{ + char S[300]; + snprintf(S,sizeof(S),"%i",Value); + Clear(Name, S); +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, string Value) +{ + Item *Top = Lookup(Name.c_str(),false); + if (Top == 0 || Top->Child == 0) + return; + + Item *Tmp, *Prev, *I; + Prev = I = Top->Child; + + while(I != NULL) + { + if(I->Value == Value) + { + Tmp = I; + // was first element, point parent to new first element + if(Top->Child == Tmp) + Top->Child = I->Next; + I = I->Next; + Prev->Next = I; + delete Tmp; + } else { + Prev = I; + I = I->Next; + } + } + } /*}}}*/ // Configuration::Clear - Clear an entire tree /*{{{*/ @@ -333,9 +374,10 @@ void Configuration::Set(const char *Name,int Value) void Configuration::Clear(string Name) { Item *Top = Lookup(Name.c_str(),false); - if (Top == 0) + if (Top == 0) { + cout << "config item: " << Name << " not found" << endl; return; - + } Top->Value = string(); Item *Stop = Top; Top = Top->Child; diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0ed8f59d3..789bc82cf 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -87,8 +87,13 @@ class Configuration bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; + // clear a whole tree void Clear(string Name); - + + // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") + void Clear(string List, string Value); + void Clear(string List, int Value); + inline const Item *Tree(const char *Name) const {return Lookup(Name);}; inline void Dump() { Dump(std::clog); }; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0ce0c9b9d..9fd71728e 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -32,6 +33,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -306,7 +308,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout) /* This is used if you want to cleanse the environment for the forked child, it fixes up the important signals and nukes all of the fds, otherwise acts like normal fork. */ -pid_t ExecFork(int dontCloseThisFd) +pid_t ExecFork() { // Fork off the process pid_t Process = fork(); @@ -326,11 +328,27 @@ pid_t ExecFork(int dontCloseThisFd) signal(SIGWINCH,SIG_DFL); signal(SIGCONT,SIG_DFL); signal(SIGTSTP,SIG_DFL); - + + set KeepFDs; + Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + int fd = atoi(Opts->Value.c_str()); + KeepFDs.insert(fd); + } + } + // Close all of our FDs - just in case for (int K = 3; K != 40; K++) - if(K != dontCloseThisFd) + { + if(KeepFDs.find(K) == KeepFDs.end()) fcntl(K,F_SETFD,FD_CLOEXEC); + } } return Process; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 4716e261e..041aa3309 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -87,7 +87,7 @@ string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); -pid_t ExecFork(int dontCloseThisFd=-1); +pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); // File string manipulators diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 61c48dcbb..2e85fc14e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,7 +25,11 @@ #include #include #include -#include +#include +#include + +#include +#include /*}}}*/ using namespace std; @@ -325,8 +329,14 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) /*}}}*/ // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- -/* This globs the operations and calls dpkg */ -bool pkgDPkgPM::Go(int status_fd) +/* This globs the operations and calls dpkg + * + * If it is called with "OutStatusFd" set to a valid file descriptor + * apt will report the install progress over this fd. It maps the + * dpkg states a package goes through to human readable (and i10n-able) + * names and calculates a percentage for each step. +*/ +bool pkgDPkgPM::Go(int OutStatusFd) { unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); @@ -336,7 +346,66 @@ bool pkgDPkgPM::Go(int status_fd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; + + // prepare the progress reporting + int Done = 0; + int Total = 0; + // map the dpkg states to the operations that are performed + // (this is sorted in the same way as Item::Ops) + static const struct DpkgState DpkgStatesOpMap[][5] = { + // Install operation + { + {"half-installed", _("Preparing %s")}, + {"unpacked", _("Unpacking %s") }, + NULL + }, + // Configure operation + { + {"unpacked",_("Preparing to configure %s") }, + {"half-configured", _("Configuring %s") }, + { "installed", _("Installed %s")}, + NULL + }, + // Remove operation + { + {"half-configured", _("Preparing for removal of %s")}, + {"half-installed", _("Removing %s")}, + {"config-files", _("Removed %s")}, + NULL + }, + // Purge operation + { + {"config-files", _("Preparing for remove with config %s")}, + {"not-installed", _("Removed with config %s")}, + NULL + }, + }; + + // the dpkg states that the pkg will run through, the string is + // the package, the vector contains the dpkg states that the package + // will go through + map > PackageOps; + // the dpkg states that are already done; the string is the package + // the int is the state that is already done (e.g. a package that is + // going to be install is already in state "half-installed") + map PackageOpsDone; + // init the PackageOps map, go over the list of packages that + // that will be [installed|configured|removed|purged] and add + // them to the PackageOps map (the dpkg states it goes through) + // and the PackageOpsTranslations (human readable strings) + for (vector::iterator I = List.begin(); I != List.end();I++) + { + string name = (*I).Pkg.Name(); + PackageOpsDone[name] = 0; + for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) + { + PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); + Total++; + } + } + + // this loop is runs once per operation for (vector::iterator I = List.begin(); I != List.end();) { vector::iterator J = I; @@ -367,16 +436,15 @@ bool pkgDPkgPM::Go(int status_fd) } } - // if we got a status_fd argument, we pass it to apt char status_fd_buf[20]; - if(status_fd > 0) - { - Args[n++] = "--status-fd"; - Size += strlen(Args[n-1]); - snprintf(status_fd_buf,20,"%i",status_fd); - Args[n++] = status_fd_buf; - Size += strlen(Args[n-1]); - } + int fd[2]; + pipe(fd); + + Args[n++] = "--status-fd"; + Size += strlen(Args[n-1]); + snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]); + Args[n++] = status_fd_buf; + Size += strlen(Args[n-1]); switch (I->Op) { @@ -449,17 +517,17 @@ bool pkgDPkgPM::Go(int status_fd) it doesn't die but we do! So we must also ignore it */ sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); - - // Fork dpkg + + // Fork dpkg pid_t Child; - if(status_fd > 0) - Child = ExecFork(status_fd); - else - Child = ExecFork(); + _config->Set("APT::Keep-Fds::",fd[1]); + Child = ExecFork(); // This is the child if (Child == 0) { + close(fd[0]); // close the read end of the pipe + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -487,19 +555,112 @@ bool pkgDPkgPM::Go(int status_fd) _exit(100); } + // clear the Keep-Fd again + _config->Clear("APT::Keep-Fds",fd[1]); + // Wait for dpkg int Status = 0; - while (waitpid(Child,&Status,0) != Child) - { - if (errno == EINTR) + + // we read from dpkg here + int _dpkgin = fd[0]; + fcntl(_dpkgin, F_SETFL, O_NONBLOCK); + close(fd[1]); // close the write end of the pipe + + // the read buffers for the communication with dpkg + char line[1024] = {0,}; + char buf[2] = {0,0}; + + // the result of the waitpid call + int res; + + while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { + if(res < 0) { + // FIXME: move this to a function or something, looks ugly here + // error handling, waitpid returned -1 + if (errno == EINTR) + continue; + RunScripts("DPkg::Post-Invoke"); + + // Restore sig int/quit + signal(SIGQUIT,old_SIGQUIT); + signal(SIGINT,old_SIGINT); + return _error->Errno("waitpid","Couldn't wait for subprocess"); + } + + // read a single char, make sure that the read can't block + // (otherwise we may leave zombies) + int len = read(_dpkgin, buf, 1); + + // nothing to read, wait a bit for more + if(len <= 0) + { + usleep(1000); continue; - RunScripts("DPkg::Post-Invoke"); + } + + // sanity check (should never happen) + if(strlen(line) >= sizeof(line)-10) + { + _error->Error("got a overlong line from dpkg: '%s'",line); + line[0]=0; + } + // append to line, check if we got a complete line + strcat(line, buf); + if(buf[0] != '\n') + continue; + + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; + + // pass "error" and "conffile-prompt" messages from dpkg verbatim + if((strncmp(line,"error",strlen("error")) == 0) || + (strncmp(line,"conffile-prompt",strlen("conffile-prompt")) == 0)) + { + write(OutStatusFd, line, strlen(line)); + line[0]=0; + continue; + } + // line contains the dpkg status info now. it has the form: + // 'status: : ' (see dpkg(1) for details) + char* list[5]; + TokSplitString(':', line, list, 5); + char *pkg = list[1]; + char *action = list[2]; + vector &states = PackageOps[pkg]; + const char *next_action = states[PackageOpsDone[pkg]].state; + const char *translation = states[PackageOpsDone[pkg]].str; + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + Done++; + ostringstream status; + // build the status str + status << "pmstatus:" << pkg + << ":" << (Done/float(Total)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + { + std::clog << "send to fd: '" << status.str() + << "'" << std::endl; + + } + + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; - // Restore sig int/quit - signal(SIGQUIT,old_SIGQUIT); - signal(SIGINT,old_SIGINT); - return _error->Errno("waitpid","Couldn't wait for subprocess"); + // reset the line buffer + line[0]=0; } + close(_dpkgin); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index b59b9dc93..2ff8a9ac7 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -23,6 +23,13 @@ using std::vector; class pkgDPkgPM : public pkgPackageManager { protected: + + // used for progress reporting + struct DpkgState + { + const char *state; // the dpkg state (e.g. "unpack") + const char *str; // the human readable translation of the state + }; struct Item { @@ -45,7 +52,7 @@ class pkgDPkgPM : public pkgPackageManager virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); virtual bool Remove(PkgIterator Pkg,bool Purge = false); - virtual bool Go(int status_fd=-1); + virtual bool Go(int StatusFd=-1); virtual void Reset(); public: diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a08ccd602..155408bb4 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -631,11 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall() +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) { OrderResult Res = OrderInstall(); if (Res != Failed) - if (Go() == false) + if (Go(status_fd) == false) return Failed; return Res; } diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 43f2c4ace..f64637d03 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -76,7 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace // Main action members bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs); - OrderResult DoInstall(); + OrderResult DoInstall(int statusFd=-1); bool FixMissing(); pkgPackageManager(pkgDepCache *Cache); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 316bb7af9..e673e0f5b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -688,7 +688,7 @@ static bool CheckAuth(pkgAcquire& Fetcher) if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) { - c2out << "Authentication warning overridden.\n"; + c2out << _("Authentication warning overridden.\n"); return true; } @@ -750,7 +750,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (Cache->BrokenCount() != 0) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, InstallPackages was called with broken packages!"); + return _error->Error(_("Internal error, InstallPackages was called with broken packages!")); } if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && @@ -765,11 +765,12 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (_config->FindB("APT::Get::Simulate") == true) { pkgSimulate PM(Cache); - pkgPackageManager::OrderResult Res = PM.DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM.DoInstall(status_fd); if (Res == pkgPackageManager::Failed) return false; if (Res != pkgPackageManager::Completed) - return _error->Error("Internal error, Ordering didn't finish"); + return _error->Error(_("Internal error, Ordering didn't finish")); return true; } @@ -810,7 +811,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << endl; - c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl; + c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << endl; } // Number of bytes @@ -840,7 +841,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, struct statvfs Buf; string OutputDir = _config->FindDir("Dir::Cache::Archives"); if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s."), @@ -994,7 +995,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, } _system->UnLock(); - pkgPackageManager::OrderResult Res = PM->DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); if (Res == pkgPackageManager::Failed || _error->PendingError() == true) return false; if (Res == pkgPackageManager::Completed) @@ -1743,7 +1745,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Fix.Resolve() == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } } @@ -1751,7 +1753,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (pkgAllUpgrade(Cache) == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } return InstallPackages(Cache,false); @@ -1922,7 +1924,7 @@ bool DoSource(CommandLine &CmdL) struct statvfs Buf; string OutputDir = "."; if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s"), diff --git a/configure.in b/configure.in index 7449bb424..7e3aba331 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.39ubuntu4") +AC_DEFINE_UNQUOTED(VERSION,"0.6.40") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.manpages b/debian/apt.manpages index 7a15245d4..e621e1c49 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8 doc/fr/apt-cdrom.fr.8 doc/fr/apt-config.fr.8 doc/fr/apt-get.fr.8 +doc/fr/apt-key.fr.8 doc/fr/apt.conf.fr.5 doc/fr/apt_preferences.fr.5 doc/fr/sources.list.fr.5 diff --git a/debian/changelog b/debian/changelog index 9784b0c92..a01e1491b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,35 +1,17 @@ -apt (0.6.39ubuntu4) breezy; urgency=low +apt (0.6.40) unstable; urgency=low - * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this - before...) + * Patch from Jordi Mallach to mark some additional strings for translation + * Updated Catalan translation from Jordi Mallach + * Merge from bubulle@debian.org--2005/apt--main--0: + - Update pot and merge with *.po + - Updated French translation, including apt-key.fr.8 + * Restore changelog entries from the 0.6.x series that went to Debian + experimental + * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 + - Provide an interface for progress reporting which can be used by + (e.g.) base-config - -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 - -apt (0.6.39ubuntu3) breezy; urgency=low - - * Fix keyring locations for Ubuntu in apt-key too. - - -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 - -apt (0.6.39ubuntu2) breezy; urgency=low - - * Install ubuntu-archive.gpg rather than debian-archive.gpg as - /etc/apt/trusted.gpg. - - -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 - -apt (0.6.39ubuntu1) breezy; urgency=low - - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - 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 - - -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 apt (0.6.39) unstable; urgency=low @@ -41,14 +23,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 - -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low @@ -64,26 +39,7 @@ apt (0.6.38) unstable; urgency=low (closes ubuntu #9935) -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 -======= - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 ->>>>>>> MERGE-SOURCE -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 - ->>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 @@ -262,6 +218,236 @@ apt (0.6.27) hoary; urgency=low -- Matt Zimmerman Mon, 13 Dec 2004 01:03:11 -0800 +apt (0.6.25) experimental; urgency=low + + * Fix handling of two-part sources for sources.list deb-src entries in + the same way that deb entries were fixed + + -- Matt Zimmerman Wed, 9 Jun 2004 05:29:50 -0700 + +apt (0.6.24) experimental; urgency=low + + * YnPrompt fixes were inadvertently left out, include them (Closes: + #249251) + + -- Matt Zimmerman Sun, 16 May 2004 14:18:53 -0700 + +apt (0.6.23) experimental; urgency=low + + * Remove obsolete pkgIterator::TargetVer() (Closes: #230159) + * Reverse test in CheckAuth to match new prompt (Closes: #248211) + + -- Matt Zimmerman Sun, 9 May 2004 21:01:58 -0700 + +apt (0.6.22) experimental; urgency=low + + * Merge 0.5.25 + * Make the unauthenticated packages prompt more intuitive (yes to + continue, default no), but require --force-yes in addition to + --assume-yes in order to override + + -- Matt Zimmerman Fri, 19 Mar 2004 13:55:35 -0800 + +apt (0.6.21) experimental; urgency=low + + * Merge 0.5.24 + + -- Matt Zimmerman Tue, 16 Mar 2004 22:52:34 -0800 + +apt (0.6.20) experimental; urgency=low + + * Merge 0.5.23 + + -- Matt Zimmerman Thu, 26 Feb 2004 17:17:02 -0800 + +apt (0.6.19) experimental; urgency=low + + * Merge 0.5.22 + * Convert apt-key(8) to docbook XML + + -- Matt Zimmerman Mon, 9 Feb 2004 15:44:49 -0800 + +apt (0.6.18) experimental; urgency=low + + * Add new Debian Archive Automatic Signing Key to the default keyring + (existing keyrings are not updated; do that yourself) + + -- Matt Zimmerman Sat, 17 Jan 2004 17:04:30 -0800 + +apt (0.6.17) experimental; urgency=low + + * Merge 0.5.21 + * Handle more IMS stuff correctly + + -- Matt Zimmerman Fri, 16 Jan 2004 10:54:25 -0800 + +apt (0.6.16) experimental; urgency=low + + * Fix some cases where the .gpg file could be left in place when it is + invalid + + -- Matt Zimmerman Fri, 9 Jan 2004 09:22:15 -0800 + +apt (0.6.15) experimental; urgency=low + + * s/Debug::Acquire::gpg/&v/ + * Honor the [vendor] syntax in sources.list again (though it is not + presently used for anything) + * Don't ship vendors.list(5) since it isn't used yet + * Revert change from 0.6.10; it was right in the first place and the + problem was apparently something else. Archive = Suite. + + -- Matt Zimmerman Mon, 5 Jan 2004 17:43:01 -0800 + +apt (0.6.14) experimental; urgency=low + + * Merge 0.5.20 + + -- Matt Zimmerman Sun, 4 Jan 2004 11:09:21 -0800 + +apt (0.6.13) experimental; urgency=low + + * Merge 0.5.19 + + -- Matt Zimmerman Sat, 3 Jan 2004 16:22:31 -0800 + +apt (0.6.12) experimental; urgency=low + + * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by + the method (as with file: and copy:). Local repositories + * Fix warning about dist name mismatch to actually print what it was + expecting + * Don't expect any particular distribution name for two-part + sources.list entries + * Merge 0.5.18 + + -- Matt Zimmerman Fri, 2 Jan 2004 13:59:00 -0800 + +apt (0.6.11) experimental; urgency=low + + * Support IMS requests of Release.gpg and Release + * This required API changes, bump the libapt-pkg version + * Copy local Release files into Dir::State::Lists + * Set IndexFile attribute when retrieving Release and Release.gpg so + that the appropriate Cache-Control headers are sent + + -- Matt Zimmerman Fri, 2 Jan 2004 10:46:17 -0800 + +apt (0.6.10) experimental; urgency=low + + * Use "Codename" (woody, sarge, etc.) to supply the value of the + "Archive" package file attribute, used to match "release a=" type + pins, rather than "Suite" (stable, testing, etc.) + + -- Matt Zimmerman Thu, 1 Jan 2004 16:56:47 -0800 + +apt (0.6.9) experimental; urgency=low + + * Another tagfile workaround + + -- Matt Zimmerman Thu, 1 Jan 2004 13:56:08 -0800 + +apt (0.6.8) experimental; urgency=low + + * Add a config option and corresponding command line option + (--allow-unauthenticated) to apt-get, to make buildd operators happy + (Closes: #225648) + + -- Matt Zimmerman Wed, 31 Dec 2003 08:28:04 -0800 + +apt (0.6.7) experimental; urgency=low + + * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully + will fix segfaults for some folks. + + -- Matt Zimmerman Wed, 31 Dec 2003 08:01:28 -0800 + +apt (0.6.6) experimental; urgency=low + + * Restore the ugly hack I removed from indexRecords::Load which set the + pkgTagFile buffer size to (file size)+256. This is concealing a bug, + but I can't fix it right now. This should fix the segfaults that + folks are seeing with 0.6.[45]. + + -- Matt Zimmerman Mon, 29 Dec 2003 18:11:13 -0800 + +apt (0.6.5) experimental; urgency=low + + * Move the authentication check into a separate function in apt-get + * Fix display of unauthenticated packages when they are in the cache + (Closes: #225336) + + -- Matt Zimmerman Sun, 28 Dec 2003 16:47:57 -0800 + +apt (0.6.4) experimental; urgency=low + + * Use the top-level Release file in LoadReleaseInfo, rather than looking + for the per-section ones (which aren't downloaded anymore). This + unbreaks release pinning, including the NotAutomatic bit used by + project/experimental + * Use FileFd::Size() rather than a separate stat() call in + LoadReleaseInfo + * Fix pkgTagFile to leave a little extra room at the end of the buffer + to append the record separator if it isn't present + * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match + the Debian archive's dist-level Release files + + -- Matt Zimmerman Sun, 28 Dec 2003 15:55:55 -0800 + +apt (0.6.3) experimental; urgency=low + + * Fix MetaIndexURI for flat ("foo/") sources + + -- Matt Zimmerman Sun, 28 Dec 2003 12:11:56 -0800 + +apt (0.6.2) experimental; urgency=low + + * Add space between package names when multiple unauthenticated packages + are being installed (Closes: #225212) + * Provide apt-key with a secret keyring and a trustdb, even though we + would never use them, because it blows up if it doesn't have them + * Fix typo in apt-key(8) (standard input is '-', not '/') + + -- Matt Zimmerman Sat, 27 Dec 2003 13:01:40 -0800 + +apt (0.6.1) experimental; urgency=low + + * Merge apt 0.5.17 + * Rearrange Release file authentication code to be more clear + * If Release is present, but Release.gpg is not, don't forget to still + queue Packages files + * Convert distribution "../project/experimental" to "experimental" for + comparison purposes + * Make a number of Release file errors into warnings; for now, it is OK + not to have a codename, for example. We mostly care about checksums + for now + + -- Matt Zimmerman Fri, 26 Dec 2003 15:12:47 -0800 + +apt (0.6.0) experimental; urgency=low + + * Signature verification support patch ("apt-secure") from Colin Walters + and Isaac Jones . This + implements: + - Release signature verification (Release.gpg) + - Packages, Sources md5sum verification against Release + - Closes: #203741 + * Make some modifications to signature verification support: + - Release.gpg is always retrieved and verified if present, rather than + requiring that sources be configured as secure + - Print a hint about installing gnupg if exec(gpgv) fails + - Remove obsolete pkgAcqIndexRel + - Move vendors.list stuff into a separate module (vendorlist.{h,cc}) + - If any files about to be retrieved are not authenticated, issue a + warning to the user and require confirmation + - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords() + * Suggests: gnupg + * Install a keyring in /usr/share/apt/debian-archive.gpg containing an + initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg + * Add a new tool, apt-key(8) used to manage the keyring + + -- Matt Zimmerman Fri, 26 Dec 2003 08:27:19 -0800 + apt (0.5.32) hoary; urgency=low * Call setlocale in the methods, so that the messages are properly diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a09ea0c37..dee0c06ff 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -84,6 +84,13 @@ APT Force-LoopBreak "false"; // DO NOT turn this on, see the man page Cache-Limit "4194304"; Default-Release ""; + + + // Write progress messages on this fd (for stuff like base-config) + Status-Fd "-1"; + // Keep the list of FDs open (normally apt closes all fds when it + // does a ExecFork) + Keep-Fds {}; }; // Options for the downloading routines @@ -234,6 +241,7 @@ Debug pkgAcquire "false"; pkgAcquire::Worker "false"; pkgDPkgPM "false"; + pkgDPkgProgressReporting "false"; pkgOrderList "false"; pkgInitialize "false"; // This one will dump the configuration space diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 24e945b2c..5cb154f66 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -88,7 +89,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, continue; Args[i++] = Opts->Value.c_str(); if(i >= 395) { - std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl; + std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; exit(111); } } @@ -181,27 +182,28 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, waitpid(pid, &status, 0); if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv exited\n"; + std::cerr << "gpgv exited\n"; } if (WEXITSTATUS(status) == 0) { if (GoodSigners.empty()) - return "Internal error: Good signature, but could not determine key fingerprint?!"; + return _("Internal error: Good signature, but could not determine key fingerprint?!"); return NULL; } else if (WEXITSTATUS(status) == 1) { - return "At least one invalid signature was encountered."; + return _("At least one invalid signature was encountered."); } else if (WEXITSTATUS(status) == 111) { - return (string("Could not execute ") + gpgvpath + - string(" to verify signature (is gnupg installed?)")).c_str(); + // FIXME String concatenation considered harmful. + return (string(_("Could not execute ")) + gpgvpath + + string(_(" to verify signature (is gnupg installed?)"))).c_str(); } else { - return "Unknown error executing gpgv"; + return _("Unknown error executing gpgv"); } } @@ -232,14 +234,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm) { if (!BadSigners.empty()) { - errmsg += "The following signatures were invalid:\n"; + errmsg += _("The following signatures were invalid:\n"); for (vector::iterator I = BadSigners.begin(); I != BadSigners.end(); I++) errmsg += (*I + "\n"); } if (!NoPubKeySigners.empty()) { - errmsg += "The following signatures couldn't be verified because the public key is not available:\n"; + errmsg += _("The following signatures couldn't be verified because the public key is not available:\n"); for (vector::iterator I = NoPubKeySigners.begin(); I != NoPubKeySigners.end(); I++) errmsg += (*I + "\n"); @@ -251,16 +253,16 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // Transfer the modification times struct stat Buf; if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat %s", Path.c_str()); + return _error->Errno("stat",_("Failed to stat %s"), Path.c_str()); struct utimbuf TimeBuf; TimeBuf.actime = Buf.st_atime; TimeBuf.modtime = Buf.st_mtime; if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime","Failed to set modification time"); + return _error->Errno("utime",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat"); + return _error->Errno("stat",_("Failed to stat")); // Return a Done response Res.LastModified = Buf.st_mtime; @@ -275,7 +277,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv suceeded\n"; + std::cerr << "gpgv succeeded\n"; } return true; @@ -284,6 +286,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + GPGVMethod Mth; return Mth.Run(); diff --git a/po/apt-all.pot b/po/apt-all.pot index 3936f3f16..d06c14ce1 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-23 11:34+0200\n" +"POT-Creation-Date: 2005-06-06 14:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -593,7 +593,7 @@ msgstr "" #: cmdline/apt-get.cc:544 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 "" @@ -715,7 +715,7 @@ msgstr "" #: cmdline/apt-get.cc:865 #, 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 "" @@ -1215,7 +1215,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 @@ -1358,7 +1358,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 @@ -2173,37 +2173,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2220,12 +2220,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/bs.po b/po/bs.po index d4f9b1f66..806c1204d 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: 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 "" @@ -606,7 +606,7 @@ msgstr "" #: cmdline/apt-get.cc:544 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 "" @@ -684,11 +684,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "" -#: 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 "" @@ -729,7 +729,7 @@ msgstr "Da, uradi kako kažem!" #: cmdline/apt-get.cc:865 #, 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 "" @@ -743,7 +743,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/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 "" @@ -752,7 +752,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: 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 "" @@ -848,7 +848,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -862,27 +862,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: 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)." msgstr "" -#: 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" @@ -890,149 +890,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: 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 "Neuspješno" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podržani moduli:" -#: 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" @@ -1229,9 +1229,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Ne mogu ukloniti %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1578,7 +1578,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 "" @@ -1705,43 +1705,43 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: 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 "Povezivanje neuspješno" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Unutrašnja greška" @@ -2269,31 +2269,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/ca.po b/po/ca.po index 980c2ec42..7fe93910e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-15 18:53+0100\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -150,7 +150,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 per a %s %s compilat el %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,13 +377,13 @@ msgstr "" "Gestiona molts estils per a generar-los, des dels completament automàtics\n" "als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n" "\n" -"apt-ftparchive genera fitxers Package des d'un arbre de .debs. El\n" +"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n" "fitxer Package conté tots els camps de control de cada paquet així com\n" "la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n" "per a forçar el valor de Prioritat i Secció.\n" "\n" -"D'un mode semblant apt-ftparchive genera fitxers Sources des d'un arbre\n" -"de .dscs. Es pot utilitzar l'opció --source-override per a especificar un\n" +"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n" +"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n" "fitxer de substitucions de src.\n" "\n" "L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n" @@ -468,7 +467,7 @@ msgstr "E: Els errors s'apliquen al fitxer " #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 #, c-format msgid "Failed to resolve %s" -msgstr "Falla al resoldre %s" +msgstr "No s'ha pogut resoldre %s" #: ftparchive/writer.cc:164 msgid "Tree walking failed" @@ -477,7 +476,7 @@ msgstr "L'arbre està fallant" #: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" -msgstr "Falla a l'obrir %s" +msgstr "No s'ha pogut obrir %s" #: ftparchive/writer.cc:246 #, c-format @@ -487,17 +486,17 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format msgid "Failed to readlink %s" -msgstr "Falla al llegir l'enllaç %s" +msgstr "No s'ha pogut llegir l'enllaç %s" #: ftparchive/writer.cc:258 #, c-format msgid "Failed to unlink %s" -msgstr "Falla a l'alliberar %s" +msgstr "No s'ha pogut alliberar %s" #: ftparchive/writer.cc:265 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Falla a l'enllaçar %s a %s" +msgstr "*** No s'ha pogut enllaçar %s a %s" #: ftparchive/writer.cc:275 #, c-format @@ -531,7 +530,7 @@ msgstr "Error intern, no s'ha pogut localitzar al membre %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falla a l'assignar espai en memòria" +msgstr "realloc - No s'ha pogut assignar espai en memòria" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -556,7 +555,7 @@ msgstr "Línia predominant %s línia malformada %lu núm 3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Falla al llegir la línia predominant del fitxer %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" #: ftparchive/multicompress.cc:75 #, c-format @@ -587,15 +586,15 @@ msgstr "Comprimeix el fil" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Error intern, falla al crear %s" +msgstr "S'ha produït un error intern, no s'ha pogut crear %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Falla al crear el subprocés IPC" +msgstr "No s'ha pogut crear el subprocés IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Falla a l'executar el compressor " +msgstr "No s'ha pogut executar el compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -603,11 +602,11 @@ msgstr "decompressor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Falla l'E/S del subprocés sobre el fitxer" +msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Falla al llegir mentre es càlculava la suma MD5" +msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -617,16 +616,16 @@ msgstr "S'ha trobat un problema treient l'enllaç %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Ha fallat el reomenament de %s a %s" +msgstr "No s'ha pogut canviar el nom de %s a %s" #: cmdline/apt-get.cc:118 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 "Error de compilació de l'expressió regular - %s" +msgstr "S'ha produït un error de compilació de l'expressió regular - %s" #: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" @@ -693,10 +692,10 @@ msgstr "%s (per %s) " #: cmdline/apt-get.cc:544 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 "" -"ATENCIÓ: Els següents paquets essencials seran eliminats\n" +"AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" #: cmdline/apt-get.cc:575 @@ -730,7 +729,7 @@ msgstr "S'estan corregint les dependències..." #: cmdline/apt-get.cc:650 msgid " failed." -msgstr " falla." +msgstr " ha fallat." #: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" @@ -758,7 +757,7 @@ msgstr "AVÍS: No es poden autenticar els següents paquets!" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " -msgstr "Voleu instal·lar aquestas paquets sense verificar-los [y/N]? " +msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " #: cmdline/apt-get.cc:700 msgid "Some packages could not be authenticated" @@ -766,17 +765,17 @@ msgstr "No s'ha pogut autenticar alguns paquets" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i -y fou usat sense --force-yes" +msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: 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 "No és possible blocar el directori de descàrrega" -#: 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 "No s'ha pogut llegir la llista de les fonts." @@ -817,12 +816,12 @@ msgstr "Sí, fes el que et dic!" #: cmdline/apt-get.cc:865 #, 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 "" -"Esteu a punt de fer quelcom potencialment nociu\n" -"Per a continuar escriviu en la frase «%s»\n" +"Esteu a punt de fer quelcom potencialment nociu.\n" +"Per a continuar escriviu la frase «%s»\n" " ?] " #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 @@ -833,7 +832,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu 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 "No s'ha pogut obtenir %s %s\n" @@ -842,9 +841,9 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: 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 "Descàrrega completa i en mode de sols descàrrega" +msgstr "Descàrrega completa i en mode de només descàrrega" #: cmdline/apt-get.cc:983 msgid "" @@ -869,14 +868,13 @@ msgstr "S'està avortant la instal·lació." #: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota: s'ha seleccionant %s en comptes de %s\n" +msgstr "Nota: s'està seleccionant %s en comptes de %s\n" #: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"S'està ometent a %s, ja està instal·lat i l'actualització no està " -"establerta.\n" +"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" #: cmdline/apt-get.cc:1054 #, c-format @@ -946,7 +944,7 @@ msgstr "Versió seleccionada %s (%s) per a %s\n" msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" @@ -962,21 +960,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: 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 "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +982,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: 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 +994,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: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,109 +1004,109 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: 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 "Ha fallat" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\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 " @@ -1117,7 +1115,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1126,32 +1124,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falla al satisfer la dependència %s per a %s: El paquet instal·lat %s és " -"massa nou" +"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " +"és massa nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falla al satisfer la dependència %s per a %s: %s" +msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: 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" @@ -1379,15 +1377,15 @@ msgstr "DropNode crida a un node que encara està enllaçat" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Falla al localitzar l'element diseminat!" +msgstr "No s'ha trobat l'element diseminat!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Falla al localitzar la desviació" +msgstr "No s'ha pogut assignar la desviació" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "Error intern en AddDiversion" +msgstr "S'ha produït un error intern en AddDiversion" #: apt-inst/filelist.cc:481 #, c-format @@ -1406,8 +1404,8 @@ msgstr "Fitxer de conf. duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" -msgstr "Ha fallat l'escriptura del fitxer %s" +msgid "Failed to write file %s" +msgstr "No s'ha pogut escriure el fitxer %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1445,7 +1443,7 @@ msgstr "El directori %s està sent reemplaçat per un no-directori" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Falla al localitzar el node dins la taula" +msgstr "No s'ha trobat el node dins de la taula" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1485,7 +1483,7 @@ msgstr "No es pot crear %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Falla al comprovar l'estat de %sinfo" +msgstr "No s'ha pogut fer «stat» de %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" @@ -1503,12 +1501,12 @@ msgstr "S'està llegint la llista de paquets" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falla al canviar pel directori de gestió %sinfo" +msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "Error intern obtenint un nom de paquet" +msgstr "S'ha produït un error intern en obtenir un nom de paquet" #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" @@ -1521,23 +1519,23 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Falla a l'obrir la llista del fitxer '%sinfo/%s'. Si no podeu restaurar " -"aquest fitxer llavores marqueu-lo amb empty i torneu a instal·lar " -"immediatament la mateixa versió del paquet!" +"No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu restaurar " +"aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " +"versió del paquet!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falla al llegir la llista del fitxer %sinfo/%s" +msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "Error intern obtinguen un node" +msgstr "S'ha produït un error en obtenir un node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falla a l'obrir el fitxer de desviació %sdiversions" +msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" @@ -1551,7 +1549,7 @@ msgstr "Línia no vàlida en el fitxer de desviació: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "Error intern afegint una desviació" +msgstr "S'ha produït un error intern en afegir una desviació" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" @@ -1564,7 +1562,7 @@ msgstr "S'està llegint la llista de fitxers" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falla al cercar un paquet: Capçalera, desplaçament %lu" +msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format @@ -1574,12 +1572,12 @@ msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Error analitzant la suma MD5. Desplaçament %lu" +msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Aquest no és un arxiu DEB vàlid, falta el membre '%s'" +msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" #: apt-inst/deb/debfile.cc:52 #, c-format @@ -1593,15 +1591,15 @@ msgstr "No s'ha pogut canviar a %s" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "Error intern, no s'ha pogut localitzar al membre" +msgstr "S'ha produït un error intern, no s'ha trobat el membre" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "S'ha fallat en localitzar un fitxer de control vàlid" +msgstr "No s'ha trobat un fitxer de control vàlid" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Fitxer de control incoherent" +msgstr "El fitxer de control no es pot analitzar" #: methods/cdrom.cc:113 #, c-format @@ -1635,7 +1633,7 @@ msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Falla a l'establir la modificació de temps" +msgstr "No s'ha pogut establir el temps de modificació" #: methods/file.cc:42 msgid "Invalid URI, local URIS must not start with //" @@ -1762,7 +1760,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: 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 escollint el fitxer" @@ -1889,43 +1887,43 @@ msgstr "Aquest servidor http té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error intern" @@ -2070,7 +2068,7 @@ msgstr "No es pot canviar a %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Falla al examinar el cdrom" +msgstr "No s'ha pogut fer «stat» del cdrom" #: apt-pkg/contrib/fileutl.cc:80 #, c-format @@ -2100,7 +2098,7 @@ msgstr "Esperava %s però no hi era" #: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-procés %s ha rebut una falla de segmentació." +msgstr "Sub-procés %s ha rebut una violació de segment." #: apt-pkg/contrib/fileutl.cc:372 #, c-format @@ -2465,13 +2463,13 @@ msgstr "Error d'E/S en desar la memòria cau de la font" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "falla de renomenat, %s (%s -> %s)." +msgstr "no s'ha pogut canviar el 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 "Suma MD5 diferent" -#: 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 " @@ -2481,7 +2479,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: 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 " @@ -2490,7 +2488,7 @@ msgstr "" "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." -#: 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." @@ -2498,7 +2496,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Mida diferent" @@ -2603,6 +2601,63 @@ msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" +#~ msgid "Authentication warning overridden.\n" +#~ msgstr "S'ha descartat l'avís d'autenticació.\n" + +#~ 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!" + +#~ msgid "Internal error, Ordering didn't finish" +#~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + +#~ 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" + +#~ msgid "Couldn't determine free space in %s" +#~ msgstr "No s'ha pogut determinar l'espai lliure en %s" + +#~ msgid "Internal error, problem resolver broke stuff" +#~ msgstr "" +#~ "S'ha produït un error intern, el solucionador de problemes ha trencat " +#~ "coses" + +#~ 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." + +#~ 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!" + +#~ msgid "At least one invalid signature was encountered." +#~ msgstr "S'ha trobat almenys una signatura invàlida." + +#~ msgid "Could not execute " +#~ msgstr "No s'ha pogut executar " + +#~ msgid " to verify signature (is gnupg installed?)" +#~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + +#~ msgid "Unknown error executing gpgv" +#~ msgstr "S'ha produït un error desconegut en executar el gpgv" + +#~ msgid "The following signatures were invalid:\n" +#~ msgstr "Les següents signatures són invàlides:\n" + +#~ msgid "" +#~ "The following signatures couldn't be verified because the public key is " +#~ "not available:\n" +#~ msgstr "" +#~ "Les següents signatures no s'han pogut verificar perquè la clau pública " +#~ "no està disponible:\n" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s" diff --git a/po/cs.po b/po/cs.po index 7dceb8c07..28f683d1a 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -147,7 +147,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 pro %s %s zkompilován na %s %s\n" @@ -617,7 +617,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: 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 "Chyba při kompilaci regulárního výrazu - %s" @@ -686,8 +686,9 @@ msgid "%s (due to %s) " msgstr "%s (kvůli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" @@ -766,11 +767,11 @@ msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" 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: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 "Nemohu zamknout adresář pro stahování" -#: 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 "Nelze přečíst seznam zdrojů." @@ -809,9 +810,9 @@ msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -827,7 +828,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/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 "Selhalo stažení %s %s\n" @@ -836,7 +837,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: 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 "Stahování dokončeno v režimu pouze stáhnout" @@ -937,7 +938,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: 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 "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -975,7 +976,7 @@ msgstr "" "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: 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" @@ -986,7 +987,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: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" @@ -996,114 +997,114 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci..." -#: 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 "Selhalo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Stažení některých archívů selhalo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\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 " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: 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 " @@ -1112,31 +1113,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: 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" @@ -1383,8 +1384,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Selhal zápis do souboru %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1737,7 +1738,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: 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 "Problém s hashováním souboru" @@ -1864,43 +1865,43 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2436,11 +2437,11 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %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 "Neshoda MD5 součtů" -#: 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 " @@ -2449,7 +2450,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: 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 " @@ -2458,14 +2459,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: 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 "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" diff --git a/po/cy.po b/po/cy.po index d8360fc3f..219125086 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: 2004-04-29 21:56-0700\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -14,145 +14,163 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:133 +#: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613 -#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355 -#: cmdline/apt-cache.cc:1506 +#: 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 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:230 -msgid "Total Package Names : " +#: cmdline/apt-cache.cc:232 +#, fuzzy +msgid "Total package names : " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:270 -msgid " Normal Packages: " +#: cmdline/apt-cache.cc:272 +#, fuzzy +msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:271 -msgid " Pure Virtual Packages: " +#: cmdline/apt-cache.cc:273 +#, fuzzy +msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:272 -msgid " Single Virtual Packages: " +#: cmdline/apt-cache.cc:274 +#, fuzzy +msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:273 -msgid " Mixed Virtual Packages: " +#: cmdline/apt-cache.cc:275 +#, fuzzy +msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:276 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:276 -msgid "Total Distinct Versions: " +#: cmdline/apt-cache.cc:278 +#, fuzzy +msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:278 -msgid "Total Dependencies: " +#: cmdline/apt-cache.cc:280 +#, fuzzy +msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:281 -msgid "Total Ver/File relations: " +#: cmdline/apt-cache.cc:283 +#, fuzzy +msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:283 -msgid "Total Provides Mappings: " +#: cmdline/apt-cache.cc:285 +#, fuzzy +msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:295 -msgid "Total Globbed Strings: " +#: cmdline/apt-cache.cc:297 +#, fuzzy +msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:309 -msgid "Total Dependency Version space: " +#: cmdline/apt-cache.cc:311 +#, fuzzy +msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:314 -msgid "Total Slack space: " +#: cmdline/apt-cache.cc:316 +#, fuzzy +msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:322 -msgid "Total Space Accounted for: " +#: cmdline/apt-cache.cc:324 +#, fuzzy +msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1229 +#: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1383 +#: cmdline/apt-cache.cc:1385 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1460 -msgid "Package Files:" +#: cmdline/apt-cache.cc:1462 +#, fuzzy +msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1468 +#: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1480 -msgid "Pinned Packages:" +#: cmdline/apt-cache.cc:1482 +#, fuzzy +msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1513 +#: cmdline/apt-cache.cc:1515 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1520 +#: cmdline/apt-cache.cc:1522 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1530 -msgid " Package Pin: " +#: cmdline/apt-cache.cc:1532 +#, fuzzy +msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1539 -msgid " Version Table:" +#: cmdline/apt-cache.cc:1541 +#, fuzzy +msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70 +#: 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:2299 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 ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1588 +#: cmdline/apt-cache.cc:1658 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -187,7 +205,7 @@ msgid "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Defnydd: apt-cache [opsiynnau] gorchymyn\n" @@ -231,6 +249,7 @@ msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" #: cmdline/apt-config.cc:76 +#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -243,8 +262,9 @@ msgid "" "Options:\n" " -h This help text.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" -msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-config [opsiynnau] gorchymyn\n" "\n" "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n" "\n" @@ -264,6 +284,7 @@ msgstr "Nid yw %s yn becyn DEB dilys." # FIXME: "debian" #: cmdline/apt-extracttemplates.cc:232 +#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -274,7 +295,7 @@ msgid "" " -h This help text\n" " -t Set the temp dir\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" "\n" @@ -303,8 +324,8 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." #: 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 -#, c-format -msgid "Error Processing directory %s" +#, fuzzy, c-format +msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" #: ftparchive/apt-ftparchive.cc:250 @@ -316,12 +337,13 @@ msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" #: ftparchive/apt-ftparchive.cc:397 -#, c-format -msgid "Error Processing Contents %s" +#, fuzzy, c-format +msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -360,7 +382,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" "Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" @@ -372,8 +394,7 @@ msgstr "" "\n" "Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" "Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a " -"dpkg-scansources.\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" "\n" "Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" "Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" @@ -502,27 +523,32 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: 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 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/writer.cc:372 +#: ftparchive/writer.cc:378 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:380 ftparchive/writer.cc:589 +#: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:423 ftparchive/writer.cc:671 +#: ftparchive/writer.cc:429 ftparchive/writer.cc:677 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +#: ftparchive/contents.cc:317 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -552,8 +578,8 @@ msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" #: ftparchive/multicompress.cc:105 @@ -574,12 +600,13 @@ msgid "Failed to fork" msgstr "Methodd fork()" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +#, fuzzy +msgid "Compress child" msgstr "Plentyn Cywasgu" #: ftparchive/multicompress.cc:238 -#, c-format -msgid "Internal Error, Failed to create %s" +#, fuzzy, c-format +msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" #: ftparchive/multicompress.cc:289 @@ -616,7 +643,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -664,15 +691,18 @@ msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" #: cmdline/apt-get.cc:421 -msgid "The following packages have been kept back" +#, fuzzy +msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" #: cmdline/apt-get.cc:442 -msgid "The following packages will be upgraded" +#, fuzzy +msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" #: cmdline/apt-get.cc:463 -msgid "The following packages will be DOWNGRADED" +#, fuzzy +msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" #: cmdline/apt-get.cc:483 @@ -685,8 +715,9 @@ msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" @@ -747,67 +778,74 @@ msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." #: cmdline/apt-get.cc:687 -msgid "WARNING: The following packages cannot be securely authenticated!" +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" #: cmdline/apt-get.cc:698 -msgid "Abort? [Y/n] " -msgstr "Erthylu? [I/n] " +msgid "Install these packages without verification [y/N]? " +msgstr "" + +#: cmdline/apt-get.cc:700 +#, fuzzy +msgid "Some packages could not be authenticated" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:755 -msgid "Packages need to be removed but Remove is disabled." +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: cmdline/apt-get.cc:762 +#, 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:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047 +#: 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 "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:811 +#: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:826 #, 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:822 +#: cmdline/apt-get.cc:829 #, 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:839 +#: cmdline/apt-get.cc:846 #, 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:848 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" - -#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 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:856 +#: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:858 -#, c-format +#: cmdline/apt-get.cc:865 +#, fuzzy, 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 "" @@ -815,28 +853,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:879 -msgid "Do you want to continue? [Y/n] " +#: cmdline/apt-get.cc:886 +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945 +#: 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 "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:972 +#: cmdline/apt-get.cc:976 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -844,103 +883,103 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:987 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:988 +#: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:989 -msgid "Aborting Install." +#: cmdline/apt-get.cc:993 +#, fuzzy +msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1022 +#: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1032 +#: cmdline/apt-get.cc:1036 #, 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:1050 +#: cmdline/apt-get.cc:1054 #, 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:1061 +#: cmdline/apt-get.cc:1065 #, 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:1073 +#: cmdline/apt-get.cc:1077 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1078 +#: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1083 -#, c-format +#: cmdline/apt-get.cc:1087 +#, fuzzy, c-format msgid "" -"Package %s has no available version, but exists in the database.\n" -"This typically means that the package was mentioned in a dependency and\n" -"never uploaded, has been obsoleted or is not available with the contents\n" -"of sources.list\n" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1103 +#: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1126 +#: cmdline/apt-get.cc:1129 #, 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:1134 +#: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1169 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1292 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1344 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -948,26 +987,27 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1363 -msgid "Internal Error, AllUpgrade broke stuff" +#: cmdline/apt-get.cc:1372 +#, fuzzy +msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1476 +#: cmdline/apt-get.cc:1494 #, 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:1506 +#: cmdline/apt-get.cc:1524 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:1509 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +1016,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1521 +#: 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" @@ -989,7 +1029,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1529 +#: 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" @@ -998,147 +1038,153 @@ 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:1534 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1563 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1630 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1650 -msgid "Calculating Upgrade... " +#: cmdline/apt-get.cc:1673 +#, fuzzy +msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1854 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:1858 cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1905 +#: cmdline/apt-get.cc:1928 #, 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:1910 +#: cmdline/apt-get.cc:1933 #, 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:1913 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1919 -#, c-format -msgid "Fetch Source %s\n" +#: cmdline/apt-get.cc:1942 +#, fuzzy, c-format +msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:1978 +#: cmdline/apt-get.cc:2001 #, 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:1990 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2007 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2026 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2042 +#: cmdline/apt-get.cc:2065 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" +msgstr "" +"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2093 #, 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:2090 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2142 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" +"s" -#: cmdline/apt-get.cc:2194 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" 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" +"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:2229 +#: cmdline/apt-get.cc:2252 #, 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" +msgstr "" +"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " +"newydd" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2304 -msgid "Supported Modules:" +#: cmdline/apt-get.cc:2327 +#, fuzzy +msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2368 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1174,7 +1220,7 @@ msgid "" " -b Build the source package after fetching it\n" " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" @@ -1242,13 +1288,14 @@ msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 +#, c-format msgid " [Working]" msgstr " [Gweithio]" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1261,6 +1308,7 @@ msgid "Unknown package record!" msgstr "Cofnod pecyn anhysbys!" #: cmdline/apt-sortpkgs.cc:150 +#, fuzzy msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" "\n" @@ -1271,7 +1319,7 @@ msgid "" " -h This help text\n" " -s Use source file sorting\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" "\n" @@ -1313,26 +1361,28 @@ msgstr "" "eto." #: dselect/update:30 -msgid "Merging Available information" +#, fuzzy +msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/contrib/extracttar.cc:115 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:140 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:192 -msgid "Tar Checksum failed, archive corrupted" +#: apt-inst/contrib/extracttar.cc:195 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:295 +#: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -1370,7 +1420,8 @@ msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +#, fuzzy +msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" #: apt-inst/filelist.cc:481 @@ -1390,8 +1441,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1426,7 +1477,8 @@ msgstr "Mae llwybr y dargyfeiriad yn rhy hir" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1481,7 +1533,8 @@ msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #: 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 -msgid "Reading Package Lists" +#, fuzzy +msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" #: apt-inst/deb/dpkgdb.cc:180 @@ -1492,11 +1545,13 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" # FIXME #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +#, fuzzy +msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +#, fuzzy +msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:216 @@ -1516,7 +1571,8 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +#, fuzzy +msgid "Internal error getting a node" msgstr "Gwall Mewnol wrth gael Nôd" # FIXME: literal @@ -1536,20 +1592,23 @@ msgid "Invalid line in the diversion file: %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +#, fuzzy +msgid "Internal error adding a diversion" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +#, fuzzy +msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +#, fuzzy +msgid "Reading file list" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:443 -#, c-format -msgid "Failed to find a Package: Header, offset %lu" +#, fuzzy, c-format +msgid "Failed to find a Package: header, offset %lu" msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" #: apt-inst/deb/dpkgdb.cc:465 @@ -1562,31 +1621,33 @@ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#: apt-inst/deb/debfile.cc:55 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:72 -#, c-format -msgid "Internal Error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +#: apt-inst/deb/debfile.cc:52 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:104 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" -#: apt-inst/deb/debfile.cc:125 -msgid "Internal Error, could not locate member" +#: apt-inst/deb/debfile.cc:138 +#, fuzzy +msgid "Internal error, could not locate member" msgstr "Gwall Methwyd, methwyd lleoli aelod" -#: apt-inst/deb/debfile.cc:158 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:243 -msgid "Unparsible control file" +#: apt-inst/deb/debfile.cc:256 +#, fuzzy +msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" #: methods/cdrom.cc:113 @@ -1595,24 +1656,26 @@ msgid "Unable to read the cdrom database %s" msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" #: methods/cdrom.cc:122 +#, fuzzy msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" -"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio " -"apt-get update i ychwanegu CDau newydd." +"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-" +"get update i ychwanegu CDau newydd." #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +#, fuzzy +msgid "Wrong CD-ROM" msgstr "CD Anghywir" #: methods/cdrom.cc:163 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei " -"ddefnyddio." +msgstr "" +"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -1642,8 +1705,8 @@ msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" #: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "Server refused our connection and said: %s" +#, fuzzy, c-format +msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" #: methods/ftp.cc:210 @@ -1661,8 +1724,8 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae " -"Acquire::ftp::ProxyLogin yn wag.)" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" # FIXME #: methods/ftp.cc:265 @@ -1683,7 +1746,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" msgstr "Gwall darllen" @@ -1695,9 +1758,9 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 methods/rsh.cc:232 -msgid "Write Error" -msgstr "Gwall Ysgrifennu" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" +msgstr "Gwall ysgrifennu" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1708,7 +1771,8 @@ msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" #: methods/ftp.cc:704 -msgid "Could not connect passive socket" +#, fuzzy +msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME @@ -1750,7 +1814,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1774,7 +1838,7 @@ msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1104 +#: methods/ftp.cc:1106 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1845,79 +1909,89 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:340 +#: methods/http.cc:344 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:486 +#: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:494 +#: methods/http.cc:498 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:513 methods/http.cc:520 -msgid "The http server sent an invalid reply header" +#: methods/http.cc:517 methods/http.cc:524 +#, fuzzy +msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:549 -msgid "The http server sent an invalid Content-Length header" +#: methods/http.cc:553 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:564 -msgid "The http server sent an invalid Content-Range header" +#: methods/http.cc:568 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:566 -msgid "This http server has broken range support" +#: methods/http.cc:570 +#, fuzzy +msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:590 +#: methods/http.cc:594 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:733 +#: methods/http.cc:741 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:738 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:761 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:789 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:814 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:828 -msgid "Error reading from server Remote end closed connection" +#: methods/http.cc:836 +#, fuzzy +msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:830 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1061 -msgid "Bad header Data" +#: methods/http.cc:1069 +#, fuzzy +msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1078 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1169 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Gwall mewnol" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" @@ -1954,8 +2028,8 @@ msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME #: apt-pkg/contrib/configuration.cc:586 -#, c-format -msgid "Syntax error %s:%u: Malformed Tag" +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" #: apt-pkg/contrib/configuration.cc:603 @@ -1966,7 +2040,8 @@ msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" #: apt-pkg/contrib/configuration.cc:643 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" +msgstr "" +"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" #: apt-pkg/contrib/configuration.cc:650 #, c-format @@ -2051,7 +2126,7 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -2080,56 +2155,52 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:358 -#, c-format -msgid "Waited, for %s but it wasn't there" +#: apt-pkg/contrib/fileutl.cc:359 +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:368 +#: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:371 +#: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:373 +#: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:417 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:473 +#: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" -#: apt-pkg/contrib/fileutl.cc:491 -msgid "Write error" -msgstr "Gwall ysgrifennu" - # FIXME -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:578 +#: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:584 +#: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2147,8 +2218,8 @@ msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" #: apt-pkg/pkgcache.cc:147 @@ -2204,15 +2275,18 @@ msgid "extra" msgstr "ychwanegol" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +#, fuzzy +msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +#, fuzzy +msgid "Candidate versions" msgstr "Fersiynau Posib" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +#, fuzzy +msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? @@ -2242,14 +2316,15 @@ msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" #: apt-pkg/sourcelist.cc:98 -#, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2267,10 +2342,15 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" #: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known in on line %u in source list %s" +#, fuzzy, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" +#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#, fuzzy, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + # FIXME: %s may have an arbirrary length #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2280,33 +2360,34 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " -"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych " -"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." +"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " +"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:238 +#: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei " -"gyfer." +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " +"ei gyfer." -#: apt-pkg/algorithms.cc:1056 +#: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod " -"wedi ei achosi gan pecynnau wedi eu dal." +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " +"ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1058 +#: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." +msgstr "" +"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." #: apt-pkg/acquire.cc:61 #, c-format @@ -2334,7 +2415,8 @@ msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" #: apt-pkg/init.cc:135 -msgid "Unable to determine a suitable system type" +#, fuzzy +msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" #: apt-pkg/clean.cc:61 @@ -2375,44 +2457,44 @@ msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occured while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occured while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occured while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occured while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occured while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occured while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occured while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei " -" drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." @@ -2420,16 +2502,17 @@ msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occured while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2455,12 +2538,12 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" # FIXME: case -#: apt-pkg/acquire-item.cc:654 +#: 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 " @@ -2469,7 +2552,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:689 +#: 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 " @@ -2478,14 +2561,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:720 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:807 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2494,10 +2577,104 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "Ni Chanfuwyd Y Ffeil" +#: apt-pkg/cdrom.cc:504 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 +msgid "Identifying.. " +msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +#: apt-pkg/cdrom.cc:538 +#, c-format +msgid "Stored label: %s \n" +msgstr "" + +#: apt-pkg/cdrom.cc:558 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:576 +msgid "Unmounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:580 +#, fuzzy +msgid "Waiting for disc...\n" +msgstr "Yn aros am benawdau" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:588 +msgid "Mounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:606 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:644 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:701 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:717 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:721 +#, fuzzy +msgid "Copying package lists..." +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-pkg/cdrom.cc:745 +#, fuzzy +msgid "Writing new source list\n" +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." + +#: apt-pkg/cdrom.cc:754 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/cdrom.cc:788 +msgid "Unmounting CD-ROM..." +msgstr "" + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#~ msgid "Abort? [Y/n] " +#~ msgstr "Erthylu? [I/n] " + +#~ msgid "Write Error" +#~ msgstr "Gwall Ysgrifennu" + +#~ msgid "File Not Found" +#~ msgstr "Ni Chanfuwyd Y Ffeil" diff --git a/po/da.po b/po/da.po index 7d8f3508f..44cf0337a 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -153,7 +153,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 for %s %s oversat p %s %s\n" @@ -623,7 +623,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: 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 "Fejl ved tolkning af regulrt udtryk - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (grundet %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" @@ -772,11 +773,11 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: 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 "Kunne ikke lse nedhentningsmappen" -#: 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 "Listen med kilder kunne ikke lses." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/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 "Kunne ikke hente %s %s\n" @@ -842,7 +843,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: 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 "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -945,7 +946,7 @@ msgstr "Valgte version %s (%s) af %s\n" msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" @@ -961,21 +962,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: 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 "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%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 "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: 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)." @@ -983,7 +984,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: 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" @@ -994,7 +995,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: 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" @@ -1003,105 +1004,105 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: 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 "Mislykkedes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\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 " @@ -1109,7 +1110,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: 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 " @@ -1118,32 +1119,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: 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 "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Understttede moduler:" -#: 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" @@ -1396,8 +1397,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opstningsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1544,7 +1545,7 @@ msgstr "Intern fejl under tilf #: apt-inst/deb/dpkgdb.cc:383 #, fuzzy -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -1752,7 +1753,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: 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 "Problem ved \"hashing\" af fil" @@ -1880,43 +1881,43 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern fejl" @@ -2373,37 +2374,37 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 #, fuzzy, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, fuzzy, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, fuzzy, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, fuzzy, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2422,12 +2423,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, fuzzy, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, fuzzy, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/de.po b/po/de.po index 3cb0cc23e..e053fee1e 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 für %s %s kompiliert am %s %s\n" @@ -376,20 +376,27 @@ 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, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" @@ -624,7 +631,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: 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 "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -693,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" @@ -775,11 +783,11 @@ msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: 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 "Kann kein Lock für das Downloadverzeichnis erhalten." -#: 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 "Die Liste der Quellen konnte nicht gelesen werden." @@ -818,9 +826,9 @@ msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -836,7 +844,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/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 "Konnte %s nicht holen %s\n" @@ -845,7 +853,7 @@ msgstr "Konnte %s nicht holen %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: 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 "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -949,7 +957,7 @@ msgstr "Gewählte Version %s (%s) für %s\n" msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" @@ -965,23 +973,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: 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 "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -989,7 +997,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: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" @@ -1001,7 +1009,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: 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" @@ -1012,110 +1020,110 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: 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 "Fehlgeschlagen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\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 " @@ -1124,7 +1132,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: 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 " @@ -1133,32 +1141,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: 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" @@ -1415,8 +1423,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1775,7 +1783,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: 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 "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1903,45 +1911,45 @@ msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interner Fehler" @@ -2488,11 +2496,11 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %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 "MD5-Summe stimmt nicht" -#: 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 " @@ -2501,7 +2509,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: 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 " @@ -2510,14 +2518,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: 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 "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Größe stimmt nicht" diff --git a/po/el.po b/po/el.po index f331c279d..4a0cfe84d 100644 --- a/po/el.po +++ b/po/el.po @@ -16,14 +16,15 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-20 15:01EEST\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"org>\n" "X-Generator: KBabel 1.9.1\n" #: cmdline/apt-cache.cc:135 @@ -160,7 +161,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 για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -336,7 +337,6 @@ msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -395,8 +395,7 @@ msgstr "" "για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n" "(Τομέας).\n" "\n" -"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από " -"μια\n" +"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n" "ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n" "για παράκαμψη των αρχείων πηγών src.\n" "\n" @@ -638,7 +637,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: 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 "σφάλμα μεταγλωτισμου - %s" @@ -707,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" @@ -790,11 +790,11 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: 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 "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: 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 "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -833,9 +833,9 @@ msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -851,7 +851,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: 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 "Αποτυχία ανάκτησης του %s %s\n" @@ -860,7 +860,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: 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 "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -966,7 +966,7 @@ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" @@ -982,21 +982,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: 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 "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%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 "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: 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)." @@ -1004,7 +1004,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: 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" @@ -1016,7 +1016,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: 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" @@ -1026,108 +1026,108 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: 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 "Απέτυχε" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: 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 "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\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 " @@ -1135,7 +1135,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: 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 " @@ -1144,32 +1144,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: 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 "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: 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" @@ -1422,8 +1422,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής στο αρχείο %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1569,6 +1569,7 @@ msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα" @@ -1776,7 +1777,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 "Πρόβλημα κατά το hashing του αρχείου" @@ -1903,44 +1904,44 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω 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 "Εσωτερικό Σφάλμα" @@ -2404,37 +2405,37 @@ msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" @@ -2454,12 +2455,12 @@ msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" @@ -2486,11 +2487,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %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" -#: 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 " @@ -2499,7 +2500,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: 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 " @@ -2508,7 +2509,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: 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." @@ -2516,7 +2517,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" diff --git a/po/en_GB.po b/po/en_GB.po index e374f13d2..574a296d3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -147,7 +147,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: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 "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "" -#: 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 "" @@ -632,7 +632,7 @@ msgstr "" #: cmdline/apt-get.cc:544 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 "" @@ -709,11 +709,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "" -#: 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 "" @@ -752,9 +752,9 @@ msgid "Yes, do as I say!" msgstr "" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -770,7 +770,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: 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 "" @@ -779,7 +779,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: 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 "" @@ -875,7 +875,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -889,21 +889,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%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 "You might want to run ‘apt-get -f install’ to correct these:" -#: 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)." @@ -911,7 +911,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: 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" @@ -919,149 +919,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: 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" @@ -1261,9 +1261,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Could not resolve ‘%s’" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1611,7 +1611,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 "" @@ -1738,43 +1738,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 "" @@ -2301,31 +2301,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/es.po b/po/es.po index 297aa64a3..e046e15c2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubn Porras Campo \n" "Language-Team: Spanish \n" @@ -151,7 +151,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 en %s %s\n" @@ -631,7 +631,7 @@ msgstr "Fall 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 "Error de compilacin de expresiones regulares - %s" @@ -700,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (por %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Se van a eliminar los siguientes paquetes esenciales\n" @@ -780,11 +781,11 @@ msgstr "Hay problemas y se utiliz msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: 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 "No se puede bloquear el directorio de descarga" -#: 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 "No se pudieron leer las listas de fuentes." @@ -824,9 +825,9 @@ msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -842,7 +843,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea 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 "Imposible obtener %s %s\n" @@ -851,7 +852,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: 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 "Descarga completa y en modo de slo descarga" @@ -952,7 +953,7 @@ msgstr "Versi msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: 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 "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin 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 "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: 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)." @@ -990,7 +991,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: 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" @@ -1002,7 +1003,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de 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" @@ -1012,107 +1013,107 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: 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 "Fall" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: 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 "No se pudo encontrar un paquete de fuentes 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 "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\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 " @@ -1121,7 +1122,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: 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 " @@ -1130,32 +1131,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: 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 "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: 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" @@ -1412,8 +1413,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuracin duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Fall el cierre del archivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: 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 "Hay problemas enlazando fichero" @@ -1894,43 +1895,43 @@ msgstr " msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error interno" @@ -2479,11 +2480,11 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %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 "La suma MD5 difiere" -#: 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 " @@ -2493,7 +2494,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: 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." @@ -2510,7 +2511,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "El tamao difiere" diff --git a/po/eu.po b/po/eu.po index fec23bfe5..590e916f8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-04-20 20:05+0200\n" "Last-Translator: Hizkuntza Politikarako Sailburuordetza \n" "Language-Team: Basque \n" @@ -152,7 +152,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 (%s %s) konpilatua: %s %s\n" @@ -620,7 +620,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: 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 "Adierazpen erregularren konpilazio-errorea - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" @@ -769,11 +770,11 @@ msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: 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 "Ezin da deskarga-direktorioa blokeatu" -#: 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 "Ezin izan da iturburu-zerrenda irakurri." @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -830,7 +831,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: 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 "Ezin da lortu %s %s\n" @@ -839,7 +840,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: 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 "Deskarga amaituta eta deskarga soileko moduan" @@ -940,7 +941,7 @@ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" @@ -956,21 +957,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: 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 "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\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 "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: 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)." @@ -978,7 +979,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: 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" @@ -990,7 +991,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: 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" @@ -999,107 +1000,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: 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 "Huts egin du" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: 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 "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\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 " @@ -1107,7 +1108,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: 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 " @@ -1116,32 +1117,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: 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" @@ -1391,8 +1392,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1749,7 +1750,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: 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 "Arazoa fitxategiaren hash egitean" @@ -1877,43 +1878,43 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Barne-errorea" diff --git a/po/fi.po b/po/fi.po index 3436485a9..04cc6473c 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 laitealustalle %s %s käännöksen päiväys %s %s\n" @@ -623,7 +623,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: 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 "Käännösvirhe lausekkeessa - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (syynä %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" @@ -772,11 +773,11 @@ msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" 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: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 "Noutokansiota ei saatu lukittua" -#: 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 "Lähteiden luetteloa ei pystynyt lukemaan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: 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 "Tiedoston %s nouto ei onnistunut %s\n" @@ -843,7 +844,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: 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 "Nouto on valmis ja määrätty vain nouto" @@ -944,7 +945,7 @@ msgstr "Valittiin versio %s (%s) paketille %s\n" msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: 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 "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%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 "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: 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)." @@ -982,7 +983,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: 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" @@ -993,7 +994,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: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" @@ -1003,106 +1004,106 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: 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 "Ei onnistunut" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\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 " @@ -1110,7 +1111,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: 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 " @@ -1119,32 +1120,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: 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 "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: 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" @@ -1394,8 +1395,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1748,7 +1749,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: 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 "Pulmia tiedoston hajautuksessa" @@ -1875,43 +1876,43 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2445,11 +2446,11 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %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 ei täsmää" -#: 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 " @@ -2458,7 +2459,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: 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 " @@ -2467,7 +2468,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: 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." @@ -2475,7 +2476,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Koko ei täsmää" diff --git a/po/fr.po b/po/fr.po index d317a2a80..26323dd75 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgid "" 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-05-26 00:44+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-28 20:52+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -151,7 +151,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 pour %s %s est compil le %s %s\n" @@ -301,8 +301,7 @@ 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" @@ -418,8 +417,7 @@ 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 @@ -629,7 +627,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: 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 "Erreur de compilation de l'expression rationnelle - %s" @@ -699,12 +697,12 @@ msgstr "%s (en raison de %s) " #: cmdline/apt-get.cc:544 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 "" -"DANGER: Les paquets essentiels suivants vont tre enlevs\n" -"Vous NE devez PAS faire ceci, moins de savoir exactement ce que vous tes\n" -"en train de faire!" +"ATTENTION: Les paquets essentiels suivants vont tre enlevs.\n" +"Vous NE devez PAS faire ceci, moins de savoir exactement ce\n" +"que vous tes en train de faire." #: cmdline/apt-get.cc:575 #, c-format @@ -777,14 +775,13 @@ 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 enlevs mais la dsinstallation est dsactive." +msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: 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 "Impossible de verrouiller le rpertoire de tlchargement" -#: 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 "La liste des sources ne peut tre lue." @@ -802,8 +799,7 @@ msgstr "Il est n #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" -"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" #: cmdline/apt-get.cc:829 #, c-format @@ -830,7 +826,7 @@ msgstr "Oui, faites ce que je vous dis !" #: cmdline/apt-get.cc:865 #, 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 "" @@ -846,7 +842,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/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 "Impossible de rcuprer %s %s\n" @@ -855,7 +851,7 @@ msgstr "Impossible de r msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: 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 "Tlchargement achev et dans le mode tlchargement uniquement" @@ -869,8 +865,7 @@ 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." @@ -932,8 +927,7 @@ 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 rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -959,7 +953,7 @@ msgstr "Version choisie %s (%s) pour %s\n" msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" @@ -975,22 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" -#: 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 "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, slectionne %s pour l'expression rationnelle %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 "" -"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" -#: 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)." @@ -998,7 +991,7 @@ msgstr "" "Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n" "(ou indiquez une solution)." -#: 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" @@ -1010,7 +1003,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "t crs ou ne sont pas sortis d'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" @@ -1019,107 +1012,107 @@ msgstr "" "Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider rsoudre la situation: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: 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 "chec" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: 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 "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\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 " @@ -1128,7 +1121,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: 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 " @@ -1137,33 +1130,32 @@ msgstr "" "La dpendance %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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Modules reconnus:" -#: 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" @@ -1336,8 +1328,7 @@ 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 "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1420,7 +1411,7 @@ msgstr "Fichier de configuration en double %s/%s" #: 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 "Erreur d'criture du fichier %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1568,7 +1559,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Le cache des paquets doit tre initialis en premier" #: apt-inst/deb/dpkgdb.cc:386 @@ -1598,8 +1589,7 @@ 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 @@ -1697,8 +1687,7 @@ 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 rpondu: %s" +msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1735,8 +1724,7 @@ 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 donnes, dlai de connexion dpass" +msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1780,7 +1768,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: 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 "Problme de hachage du fichier" @@ -1909,43 +1897,43 @@ msgstr "Ce serveur http poss msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erreur interne" @@ -2270,14 +2258,12 @@ 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 forme dans la liste des sources %s (distribution absolue)" +msgstr "Ligne %lu mal forme 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 forme dans la liste des sources %s (analyse de distribution)" +msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2297,14 +2283,12 @@ 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 forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2325,8 +2309,7 @@ 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 rinstall, mais je ne parviens pas trouver son " "archive." @@ -2381,8 +2364,7 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "Vous devez insrer 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." @@ -2415,37 +2397,37 @@ msgstr "Le cache poss #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2456,8 +2438,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Vous avez dpass le nombre de versions que cet APT est capable de traiter." +msgstr "Vous avez dpass 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." @@ -2467,12 +2448,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2493,8 +2474,7 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "" -"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format @@ -2526,8 +2506,7 @@ msgstr "" #: 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." @@ -2637,6 +2616,36 @@ msgstr "" "%i enregistrements crits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "Le cache des paquets doit tre initialis en premier" + +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" + #~ msgid "Total Package Names : " #~ msgstr "Nombre total de paquets: " @@ -2842,32 +2851,3 @@ msgstr "" #~ 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 189370945..8dae868ef 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -148,7 +148,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 בשביל %s %s קומפל על %s %s\n" @@ -523,7 +523,7 @@ msgstr "כשלון בשינוי השם %s ל-%s" msgid "Y" msgstr "Y" -#: 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 "" @@ -592,8 +592,9 @@ msgid "%s (due to %s) " msgstr "%s (בגלל %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" @@ -638,8 +639,7 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" -msgstr "" -"א ז ה ר ה: החבילות החיוניות הבאות יוסרו" +msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" #: cmdline/apt-get.cc:658 msgid " Done" @@ -674,11 +674,11 @@ msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא הא msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "לא מצליח לנעול את ספרית ההורדה." -#: 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 "רשימת המקורות לא ניתנת לקריאה." @@ -719,7 +719,7 @@ msgstr "כן, עשה כפי שאני אומר!" #: cmdline/apt-get.cc:865 #, 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 "" @@ -733,7 +733,7 @@ msgstr "בטל." msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/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 "כשלון בהבאת %s %s\n" @@ -742,7 +742,7 @@ msgstr "כשלון בהבאת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: 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 "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -838,7 +838,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -852,27 +852,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: 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)." msgstr "" -#: 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" @@ -880,149 +880,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: 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" @@ -1219,9 +1219,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "כשלון בפענוח %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1566,7 +1566,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 "" @@ -1693,43 +1693,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 "" @@ -2256,31 +2256,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/hu.po b/po/hu.po index cdc21fce3..5dbebd086 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -151,7 +151,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 ehhez: %s %s fordítás ideje: %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" msgid "Y" msgstr "I" -#: 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 "Regex fordítási hiba - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (%s miatt) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" @@ -773,11 +774,11 @@ msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" 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: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 "Nem tudom zárolni a letöltési könyvtárat" -#: 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 források listája olvashatatlan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/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 "Nem sikerült letölteni a következőt: %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nem sikerült letölteni a következőt: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: 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 "A letöltés befejeződött a 'csak letöltés' módban" @@ -944,7 +945,7 @@ msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: 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 "Nem található a(z) %s csomag" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" -#: 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)." @@ -983,7 +984,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: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" @@ -995,7 +996,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: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" @@ -1005,108 +1006,108 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A következő információ talán segít megoldani a helyzetet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "A következő extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: 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 "Sikertelen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, 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:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1116,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1125,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: 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" @@ -1397,8 +1398,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nem sikerült a(z) %s fájlba írni" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1755,7 +1756,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: 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 "Probléma a fájl hash értékének meghatározásakor" @@ -1882,43 +1883,43 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat " msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Belső hiba" @@ -2461,11 +2462,11 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %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 "Az MD5Sum nem megfelelő" -#: 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 " @@ -2474,7 +2475,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: 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 " @@ -2483,14 +2484,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." -#: 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 "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "A méret nem megfelelő" diff --git a/po/it.po b/po/it.po index 602e441ab..edb215bbc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -147,7 +147,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 per %s %s compilato il %s %s\n" @@ -623,7 +623,7 @@ msgstr "Impossibile rinominare %s in %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 "Errore di compilazione della regex - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (a causa di %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n" @@ -774,11 +775,11 @@ msgstr "Sussistono dei problemi e -y msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: 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 "Impossibile creare un lock sulla directory di 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 "La lista dei sorgenti non pu essere letta." @@ -819,9 +820,9 @@ msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -837,7 +838,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [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 "Impossibile ottenere %s %s\n" @@ -846,7 +847,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: 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 completato e in modalit download-only" @@ -949,7 +950,7 @@ msgstr "Versione selezionata %s (%s) per %s\n" msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" @@ -965,22 +966,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: 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 "Impossibile trovare %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -988,7 +989,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: 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" @@ -1000,7 +1001,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: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" @@ -1010,107 +1011,107 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: 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 "Fallito" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" -#: 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 "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficente" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\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 " @@ -1119,7 +1120,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: 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 " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduli supportati:" -#: 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" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplice %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Scrittura del file %s fallita" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: 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 "Problemi nella creazione dell'hash del file" @@ -1895,44 +1896,44 @@ msgstr "Questo server HTTP ha il supporto del range bacato" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Errore interno" @@ -2479,11 +2480,11 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente" msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %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 "Somma MD5 non corrispondente" -#: 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 " @@ -2493,7 +2494,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: 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." @@ -2510,7 +2511,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" diff --git a/po/ja.po b/po/ja.po index fa9829bb2..acd03c6cc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 12:54+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: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 for %s %s ѥ: %s %s\n" @@ -622,7 +622,7 @@ msgstr "%s msgid "Y" msgstr "Y" -#: 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 "ɽŸ顼 - %s" @@ -691,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (%s Τ) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ٹ: ʲԲķѥåޤ\n" @@ -773,11 +774,11 @@ msgstr " msgid "Packages need to be removed but remove is disabled." msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ" -#: 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 "ɥǥ쥯ȥåǤޤ" -#: 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 "ΥꥹȤɤळȤǤޤ" @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "³Ԥޤ [Y/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 "%s μ˼Ԥޤ %s\n" @@ -843,7 +844,7 @@ msgstr "%s msgid "Some files failed to download" msgstr "ĤΥեμ˼Ԥޤ" -#: 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 "ɥ꡼⡼ɤǥѥåΥɤλޤ" @@ -946,7 +947,7 @@ msgstr "%3$s msgid "The update command takes no arguments" msgstr "update ޥɤϰޤ" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "list ǥ쥯ȥå뤳ȤǤޤ" @@ -962,23 +963,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "顼AllUpgrade ˲ޤ" -#: 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 "ѥå %s դޤ" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr ": ɽ '%2$s' Ф %1$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 "" "ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷" "ޤ:" -#: 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)." @@ -986,7 +987,7 @@ msgstr "" "̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ" "Ƥ)" -#: 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" @@ -998,7 +999,7 @@ msgstr "" "Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n" "ƤΤȹͤޤ" -#: 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" @@ -1008,107 +1009,107 @@ msgstr "" "ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n" "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "줿ѥå" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "ƥѥå:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "侩ѥå:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "åץ졼ɥѥå򸡽ФƤޤ... " -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "λ" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ" -#: 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 "%s ΥѥåĤޤ" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ˽ʬʶڡޤ" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB %1$sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr " %s \n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "ĤΥ֤μ˼Ԥޤ" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "ӥɥޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "ҥץԤޤ" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s build-dependency 뤳ȤǤޤ" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s ˤ build depends ꤵƤޤ\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 " @@ -1117,7 +1118,7 @@ msgstr "" "ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط" "Ǥޤ" -#: 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 " @@ -1126,32 +1127,32 @@ msgstr "" "ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s " " %1$s ΰ¸طȤǤޤ" -#: 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 "" "%2$s ΰ¸ط %1$s ȤǤޤ: 󥹥ȡ뤵줿 %3$s ѥ" "Ͽޤ" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s Build-dependency ȤǤޤǤ" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "build dependency ν˼Ԥޤ" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "ݡȤƤ⥸塼:" -#: 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" @@ -1402,8 +1403,8 @@ msgid "Duplicate conf file %s/%s" msgstr "ե %s/%s ʣƤޤ" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s ν񤭹ߤ˼Ԥޤ" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1758,7 +1759,7 @@ msgstr " msgid "Unable to accept connection" msgstr "³ accept Ǥޤ" -#: 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 "եΥϥåǤ" @@ -1885,43 +1886,43 @@ msgstr "http msgid "Unknown date format" msgstr "եեޥåȤǤ" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select ˼Ԥޤ" -#: 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 "顼" @@ -2461,11 +2462,11 @@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "͡˼Ԥޤ%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 Ŭ礷ޤ" -#: 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 " @@ -2474,7 +2475,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ (¸ߤʤƥΤ)" -#: 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 " @@ -2483,7 +2484,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ" -#: 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." @@ -2491,7 +2492,7 @@ msgstr "" "ѥåǥåե뤬Ƥޤѥå %s Filename: " "եɤޤ" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ŭ礷ޤ" diff --git a/po/ko.po b/po/ko.po index 50999a8da..ebb80cb0d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -145,7 +145,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 (%s %s), 컴파일 시각 %s %s\n" @@ -619,7 +619,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: 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 "정규식 컴파일 오류 - %s" @@ -688,8 +688,9 @@ msgid "%s (due to %s) " msgstr "%s (%s때문에) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n" @@ -769,11 +770,11 @@ msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: 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 "내려받기 디렉토리를 잠글 수 없습니다" -#: 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 "소스 목록을 읽을 수 없습니다." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/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 "%s 파일을 받는 데 실패했습니다 %s\n" @@ -842,7 +843,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: 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 "내려받기를 마쳤고 내려받기 전용 모드입니다" @@ -944,7 +945,7 @@ msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: 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 "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$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 "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: 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)." @@ -983,7 +984,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: 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" @@ -994,7 +995,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 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" @@ -1003,105 +1004,105 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: 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 "실패" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: 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 "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\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 " @@ -1110,7 +1111,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: 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 " @@ -1119,32 +1120,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: 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 "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: 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" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1746,7 +1747,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 "파일 해싱에 문제가 있습니다" @@ -1873,43 +1874,43 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select가 실패했습니다" -#: 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 "내부 오류" @@ -2442,11 +2443,11 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %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이 맞지 않습니다" -#: 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 " @@ -2455,7 +2456,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: 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 " @@ -2464,14 +2465,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: 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 "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" diff --git a/po/nb.po b/po/nb.po index ff8fce4a2..ad66a1e9f 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokml \n" @@ -162,7 +162,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 for %s %s kompilert p %s %s\n" @@ -637,7 +637,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: 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 "Kompileringsfeil i regulrt uttrykk - %s" @@ -706,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (pga. %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ADVARSEL: Flgende kjernepakker vil bli fjernet\n" @@ -786,11 +787,11 @@ msgstr "Det oppsto problemer og msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: 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 "Klarer ikke lse nedlastingsmappa" -#: 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 "Kan ikke lese kildlista." @@ -830,9 +831,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -848,7 +849,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/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 "Klarte ikke skaffe %s %s\n" @@ -857,7 +858,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: 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 "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -959,7 +960,7 @@ msgstr "Utvalgt versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" @@ -975,21 +976,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: 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 "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %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 "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: 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)." @@ -997,7 +998,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: 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" @@ -1009,7 +1010,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: 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" @@ -1019,112 +1020,112 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: 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 "Mislyktes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\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 " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: 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 " @@ -1133,32 +1134,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Stttede moduler:" -#: 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" @@ -1409,8 +1410,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: 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 "Problem ved oppretting av nkkel for fil" @@ -1894,43 +1895,43 @@ msgstr "Denne HTTP-tjeneren har msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2465,11 +2466,11 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %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 "Feil MD5sum" -#: 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 " @@ -2478,7 +2479,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: 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 " @@ -2487,13 +2488,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: 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 "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil strrelse" diff --git a/po/nl.po b/po/nl.po index f0b90d9bf..48a2801f4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 voor %s %s gecompileerd op %s %s\n" @@ -627,7 +627,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: 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 "Regex-compilatiefout - %s" @@ -696,8 +696,9 @@ msgid "%s (due to %s) " msgstr "%s (wegens %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n" @@ -777,11 +778,11 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: 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 "Kon de ophaalmap niet vergrendelen" -#: 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 "De lijst van bronnen kon niet gelezen worden." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -838,7 +839,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/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 "Ophalen van %s %s is mislukt\n" @@ -847,7 +848,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: 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 "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -951,7 +952,7 @@ msgstr "Versie %s (%s) geselecteerd voor %s\n" msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" @@ -967,23 +968,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: 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 "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -991,7 +992,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: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" @@ -1002,7 +1003,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: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" @@ -1012,109 +1013,109 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: 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 "Mislukt" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\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 " @@ -1123,7 +1124,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: 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 " @@ -1132,32 +1133,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:2243 +#: cmdline/apt-get.cc:2252 #, 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: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: 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" @@ -1417,8 +1418,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1775,7 +1776,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: 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 "Probleem bij het hashen van het bestand" @@ -1904,44 +1905,44 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interne fout" @@ -2489,11 +2490,11 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %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 komt niet overeen" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: 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 " @@ -2511,7 +2512,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: 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." @@ -2519,7 +2520,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Grootte komt niet overeen" diff --git a/po/nn.po b/po/nn.po index 4284ac7cd..6bd23e0f9 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -151,7 +151,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 for %s %s kompilert p %s %s\n" @@ -621,7 +621,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: 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 "Regex-kompileringsfeil - %s" @@ -690,8 +690,9 @@ msgid "%s (due to %s) " msgstr "%s (fordi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" @@ -771,11 +772,11 @@ msgstr "Det oppstod problem, og msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: 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 "Klarte ikkje lsa nedlastingskatalogen" -#: 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 "Kjeldelista kan ikkje lesast." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/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 "Klarte ikkje henta %s %s\n" @@ -842,7 +843,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: 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 "Nedlastinga er ferdig i nedlastingsmodus" @@ -945,7 +946,7 @@ msgstr "Vald versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" @@ -961,22 +962,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: 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 "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %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 "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: 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 +985,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: 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 +997,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: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,112 +1007,112 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: 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 "Mislukkast" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\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 " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: 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 " @@ -1120,31 +1121,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Sttta modular:" -#: 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" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1750,7 +1751,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: 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 "Problem ved oppretting av nkkel for fil" @@ -1877,43 +1878,43 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2448,11 +2449,11 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %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 "Feil MD5-sum" -#: 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 " @@ -2461,7 +2462,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: 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 " @@ -2469,14 +2470,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: 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 "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil storleik" diff --git a/po/pl.po b/po/pl.po index 26a5239b7..be2659af4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -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 dla %s %s skompilowany %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: 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 "Bd kompilacji wyraenia regularnego - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (z powodu %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "UWAGA: Zostan usunite nastpujce istotne pakiety\n" @@ -773,11 +774,11 @@ msgstr "By msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: 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 "Nie udao si zablokowa katalogu pobierania" -#: 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 "Nie udao si odczyta list rde." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/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 "Nie udao si pobra %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nie uda msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: 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 "Ukoczono pobieranie w trybie samego pobierania" @@ -946,7 +947,7 @@ msgstr "Wybrano wersj msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" @@ -962,21 +963,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: 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 "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%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 "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: 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 +985,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: 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 +997,7 @@ msgstr "" "niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodzce\")." -#: 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,110 +1007,110 @@ msgstr "" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: 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 "Nie udao si" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: 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 "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\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 " @@ -1118,7 +1119,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: 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 " @@ -1127,32 +1128,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: 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 "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: 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" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nie udao si zapisa pliku %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: 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 "Nie udao si obliczy skrtu pliku" @@ -1887,43 +1888,43 @@ msgstr "Ten serwer HTTP nieprawid msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2463,11 +2464,11 @@ msgstr "B msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %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 "Bdna suma MD5" -#: 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 " @@ -2476,7 +2477,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: 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 " @@ -2485,14 +2486,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: 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 "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Bdny rozmiar" diff --git a/po/pt.po b/po/pt.po index 4b1568efe..84bc5b49d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -148,7 +148,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" @@ -620,7 +620,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" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (devido a %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Os seguintes pacotes essenciais serão removidos\n" @@ -770,11 +771,11 @@ msgstr "Há problemas e -y foi usado sem --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: 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 directó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." @@ -814,9 +815,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -832,7 +833,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/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 obter %s %s\n" @@ -841,7 +842,7 @@ msgstr "Falha ao obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: 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" @@ -944,7 +945,7 @@ msgstr "Versão seleccionada %s (%s) para %s\n" 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 directório de listas" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: 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 encontrar o pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -982,7 +983,7 @@ msgstr "" "Dependências não satisfeitas. 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" @@ -994,7 +995,7 @@ msgstr "" "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados 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" @@ -1005,109 +1006,109 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra 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 Actualizaçã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 obtenha o código 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 de código 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 obter %sB/%sB de arquivos de código 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 de código fonte.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao obter 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 "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "O 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 especificar pelo menos um pacote para verificar as dependências de " "compilaçã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 obter informações de dependências de compilaçã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 compilaçã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 " @@ -1116,7 +1117,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 " @@ -1125,32 +1126,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 requesitos 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 a 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 compilaçã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" @@ -1404,8 +1405,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1551,8 +1552,8 @@ 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 initialize first" -msgstr "A cache de pacotes deve ser inicializada primeiro" +msgid "The pkg cache must be initialized first" +msgstr "A cache de pacotes tem de ser inicializada primeiro" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1758,7 +1759,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligaçã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 ficheiro" @@ -1885,43 +1886,43 @@ msgstr "Este servidor http possui suporte a range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligaçã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 errados" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2383,37 +2384,37 @@ msgstr "A Cache possui um sistema de versões incompatível" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +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 occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2434,12 +2435,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %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 occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2602,34 +2603,34 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#~ msgid "The pkg cache must be initialized first" -#~ msgstr "A cache de pacotes tem de ser inicializada primeiro" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "A cache de pacotes deve ser inicializada primeiro" -#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgid "Error occured while processing %s (NewPackage)" #~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgid "Error occured while processing %s (UsePackage1)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgid "Error occured while processing %s (UsePackage2)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgid "Error occured while processing %s (NewFileVer1)" #~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgid "Error occured while processing %s (NewVersion1)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgid "Error occured while processing %s (UsePackage3)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgid "Error occured while processing %s (NewVersion2)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgid "Error occured while processing %s (FindPkg)" #~ msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgid "Error occured while processing %s (CollectFileProvides)" #~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 82271928b..968259925 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n" -"POT-Creation-Date: 2005-05-23 11:34+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: Andr Lus Lopes \n" "Language-Team: Debian-BR Project \n" @@ -691,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (por causa de %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Os pacotes essenciais a seguir sero removidos\n" @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faa o que eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -1401,8 +1402,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de confgiurao duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1548,7 +1549,8 @@ 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 initialize first" +#, fuzzy +msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:386 @@ -2382,38 +2384,38 @@ msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de verses incompatvel" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occured while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occured while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occured while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occured while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occured while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occured while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occured while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2433,13 +2435,13 @@ msgstr "" "Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occured while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ro.po b/po/ro.po index 714787236..30546b718 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -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 pentru %s %s compilat pe %s %s\n" @@ -629,7 +629,7 @@ msgstr "Eşuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: 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 "Eroare de compilare regex - %s" @@ -698,8 +698,9 @@ msgid "%s (due to %s) " msgstr "%s (datorită %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n" @@ -779,11 +780,11 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: 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 "Nu pot încuia directorul de descărcare" -#: 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 "Lista surselor nu poate fi citită." @@ -823,9 +824,9 @@ msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -842,7 +843,7 @@ msgstr "Renunţare." msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi? [Y/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 "Eşuare în aducerea %s %s\n" @@ -851,7 +852,7 @@ msgstr "Eşuare în aducerea %s %s\n" msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: 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 "Descărcare completă şi în modul doar descărcare" @@ -952,7 +953,7 @@ msgstr "Versiune selectată %s (%s) pentru %s\n" msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: 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 "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru regex '%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 "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: 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)." @@ -990,7 +991,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: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" @@ -1003,7 +1004,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din 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" @@ -1013,107 +1014,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: 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 "Eşuare" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gata" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie de %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\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 " @@ -1122,7 +1123,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1131,32 +1132,32 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface cererile de versiuni" -#: 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 "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Module suportate:" -#: 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" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Eşuare în a scrie fişierul %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1768,7 +1769,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: 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 "Problemă la criptarea fişierului" @@ -1895,44 +1896,44 @@ msgstr "Acest server http are zonă de suport necorespunzătoare" msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Eroare internă" @@ -2476,11 +2477,11 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %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 "Nepotrivire MD5Sum" -#: 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 " @@ -2489,7 +2490,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet (din pricina unui arch lipsă)" -#: 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 " @@ -2498,7 +2499,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet." -#: 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." @@ -2506,7 +2507,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" diff --git a/po/ru.po b/po/ru.po index de0660f8c..5b36cc5ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 19:50+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -161,7 +161,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 для %s %s скомпилирован %s %s\n" @@ -644,7 +644,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: 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 "Ошибка компиляции регулярного выражения - %s" @@ -714,8 +714,9 @@ msgid "%s (due to %s) " msgstr "%s (вследствие %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" @@ -796,11 +797,11 @@ msgstr "Существуют проблемы, а опция -y использо msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: 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 "Невозможно заблокировать каталог для загрузки" -#: 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 "Не читается перечень источников." @@ -843,9 +844,9 @@ msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -861,7 +862,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: 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 "Не удалось загрузить %s %s\n" @@ -870,7 +871,7 @@ msgstr "Не удалось загрузить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: 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 "Указан режим \"только загрузка\", и загрузка завершена" @@ -972,7 +973,7 @@ msgstr "Выбрана версия %s (%s) для %s\n" msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" @@ -988,23 +989,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: 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 "Не могу найти пакет %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$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 "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: 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)." @@ -1012,7 +1013,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: 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" @@ -1023,7 +1024,7 @@ msgstr "" "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из 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" @@ -1033,111 +1034,111 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация возможно поможет Вам:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Настойчиво рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Рассчёт обновлений... " -#: 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 "Неудачно" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: 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 "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\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 " @@ -1146,7 +1147,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: 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 " @@ -1155,32 +1156,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: 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 "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: 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" @@ -1432,8 +1433,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Не удалось записать файл %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1789,7 +1790,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 "Проблема при хэшировании файла" @@ -1917,43 +1918,43 @@ msgstr "Этот http-сервер не поддерживает загрузк msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ошибка в select" -#: 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 "Внутренняя ошибка" @@ -2495,11 +2496,11 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %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 не совпадает" -#: 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 " @@ -2508,7 +2509,7 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен 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 " @@ -2517,13 +2518,13 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." -#: 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 "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Не совпадает размер" diff --git a/po/sk.po b/po/sk.po index c3fc16df9..dd7cb2636 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,9 +7,9 @@ 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-09 11:29+0100\n" -"Last-Translator: Peter KLFMANiK Mann \n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-01 09:34+0200\n" +"Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,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 pre %s %s skompilovaný na %s %s\n" @@ -322,7 +322,6 @@ msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -377,16 +376,16 @@ msgstr "" "\n" "apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" "Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n" -"veľkosť a MD5 súčet. Podporovaný je tiež súbor override, pomocou ktorého\n" +"veľkosť a MD5 súčet. Podporovaný je tiež súbor 'override', pomocou ktorého\n" "môžete vynútiť hodnoty polí Priority a Section.\n" "\n" "Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n" -"Sources. Voľbou --source-override môžete určiť zdrojový súbor override.\n" +"Sources. Voľbou --source-override môžete určiť zdrojový súbor 'override'.\n" "\n" "Príkazy 'packages' a 'sources' by sa mali spúšťať v koreni stromu.\n" "Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n" -"a súbor override by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" -"prefix_cesty, pridá sa do polí Filename.\n" +"a súbor 'override' by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" +"prefix_cesty, pridá sa do polí 'filename'.\n" "Skutočný príklad z archívu Debianu:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -394,7 +393,7 @@ msgstr "" "Voľby:\n" " -h Táto nápoveda\n" " --md5 Vygeneruje kontrolný MD5 súčet\n" -" -s=? Zdrojový súbor override\n" +" -s=? Zdrojový súbor 'override'\n" " -q Tichý režim\n" " -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" " --no-delink Povolí ladiaci režim\n" @@ -619,7 +618,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: 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 "Chyba pri preklade regulárneho výrazu - %s" @@ -688,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (kvôli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" @@ -768,11 +768,11 @@ msgstr "Nastali problémy a -y bolo použité bez --force-yes" 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: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 "Adresár pre sťahovanie sa nedá zamknúť" -#: 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 "Nedá sa načítať zoznam zdrojov." @@ -811,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -829,7 +829,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/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 "Zlyhalo stiahnutie %s %s\n" @@ -838,7 +838,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: 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 "Sťahovanie ukončené v režime \"iba stiahnuť\"" @@ -938,7 +938,7 @@ msgstr "Zvolená verzia %s (%s) pre %s\n" msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" @@ -954,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: 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 "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +976,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: 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" @@ -988,7 +988,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: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" @@ -998,114 +998,114 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: 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 "Chyba" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\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 " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: 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 " @@ -1114,31 +1114,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: 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" @@ -1387,8 +1387,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Zápis do súboru %s zlyhal" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1534,8 +1534,9 @@ msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" -msgstr "Vyrovnávacia pamäť balíkov sa najprv musí inicializovať" +msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1741,7 +1742,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: 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 "Problém s hashovaním súboru" @@ -1868,43 +1869,43 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2358,39 +2359,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Pri spracovaní %s sa objavila chyba (NewPackage)" +msgstr "Chyba pri spracovaní %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage1)" +msgstr "Chyba pri spracovaní %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage2)" +msgstr "Chyba pri spracovaní %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewFileVer1)" +msgstr "Chyba pri spracovaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion1)" +msgstr "Chyba pri spracovaní %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage3)" +msgstr "Chyba pri spracovaní %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion2)" +msgstr "Chyba pri spracovaní %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2407,14 +2408,14 @@ msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Pri spracovaní %s sa objavila chyba (CollectFileProvides)" +msgstr "Chyba pri spracovaní %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2439,11 +2440,11 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %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 "Nezhoda MD5 súčtov" -#: 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 " @@ -2452,7 +2453,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: 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 " @@ -2461,13 +2462,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: 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 "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" diff --git a/po/sl.po b/po/sl.po index 2147c6f53..ad8aea470 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 za %s %s preveden na %s %s\n" @@ -616,7 +616,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: 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 "Napaka pri prevajanju regex - %s" @@ -685,8 +685,9 @@ msgid "%s (due to %s) " msgstr "%s (zaradi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" @@ -765,11 +766,11 @@ msgstr "Pri msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: 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 "Ni mogoe zakleniti imenika za prenose" -#: 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 "Seznama virov ni mogoe brati." @@ -808,9 +809,9 @@ msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -826,7 +827,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/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 "Ni mogoe dobiti %s %s\n" @@ -835,7 +836,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: 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 "Prenos dokonan in uporabljen nain samo prenos" @@ -936,7 +937,7 @@ msgstr "Izbrana razli msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" @@ -952,21 +953,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: 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 "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%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 "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: 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)." @@ -974,7 +975,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: 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" @@ -985,7 +986,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: 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" @@ -995,115 +996,115 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: 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 "Spodletelo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\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 " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: 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 " @@ -1112,31 +1113,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: 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 "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podprti moduli:" -#: 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" @@ -1387,8 +1388,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1740,7 +1741,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: 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 "Teava pri razprevanju datoteke" @@ -1867,43 +1868,43 @@ msgstr "Ta stre msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Notranja napaka" @@ -2437,11 +2438,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %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 "Neujemanje vsote MD5" -#: 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 " @@ -2450,7 +2451,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: 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 " @@ -2459,7 +2460,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: 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." @@ -2467,7 +2468,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Neujemanje velikosti" diff --git a/po/sv.po b/po/sv.po index 17827b7cc..367f6680e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-01-15 15:30+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" @@ -150,7 +150,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 fr %s %s kompilerad den %s %s\n" @@ -628,7 +628,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: 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 "Fel vid tolkning av reguljrt uttryck - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (p grund av %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VARNING: Fljande systemkritiska paket kommer att tas bort\n" @@ -777,11 +778,11 @@ msgstr "Problem har uppst msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: 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 "Kunde inte lsa hmtningskatalogen." -#: 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 "Listan ver kllor kunde inte lsas." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -839,7 +840,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/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 "Misslyckades att hmta %s %s\n" @@ -848,7 +849,7 @@ msgstr "Misslyckades att h msgid "Some files failed to download" msgstr "Misslyckades att hmta vissa filer" -#: 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 "Hmtningen frdig i \"endast-hmta\"-lge" @@ -950,7 +951,7 @@ msgstr "Vald version %s (%s) f msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" @@ -966,21 +967,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: 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 "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr regex \"%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 "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":" -#: 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)." @@ -988,7 +989,7 @@ msgstr "" "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: 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" @@ -1000,7 +1001,7 @@ msgstr "" "distributionen, att ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"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" @@ -1010,105 +1011,105 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skrivas." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: 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 "Misslyckades" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: 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 "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Misslyckades att hmta vissa arkiv." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\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 " @@ -1116,7 +1117,7 @@ msgid "" msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: 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 " @@ -1125,32 +1126,32 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s uppfyller versionskraven" -#: 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 "" "Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s " "r fr nytt" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduler som stds:" -#: 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" @@ -1406,8 +1407,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1762,7 +1763,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: 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 "Problem med att lgga filen till hashtabellen" @@ -1894,43 +1895,43 @@ msgstr "Denna http-servers st msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internt fel" @@ -2472,11 +2473,11 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %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 "MD5-kontrollsumma stmmer inte" -#: 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 " @@ -2485,7 +2486,7 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: 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 " @@ -2494,13 +2495,13 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: 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 "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Storleken stmmer inte" diff --git a/po/tl.po b/po/tl.po index f4d26b826..9fc7a93ba 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -152,7 +152,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 sa %s %s kinompile noong %s %s\n" @@ -628,7 +628,7 @@ msgstr "Sawi ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: 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 "Error sa pag-compile ng regex - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" @@ -779,11 +780,11 @@ 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: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 "Di maaldaba ang directory ng 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 "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -822,9 +823,9 @@ msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -840,7 +841,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: 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 "Sawi sa pagkuha ng %s %s\n" @@ -849,7 +850,7 @@ msgstr "Sawi sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga tipunang hindi nakuha" -#: 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 "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" @@ -951,7 +952,7 @@ msgstr "Ang napiling bersyon %s (%s) para sa %s\n" msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" @@ -967,22 +968,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: 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 "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%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 "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: 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)." @@ -990,7 +991,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: 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" @@ -1001,7 +1002,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: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" @@ -1011,106 +1012,106 @@ msgstr "" "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " -#: 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 "Sawi" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Sawi sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Sawi ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay sawi.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Sawi ang prosesong anak" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\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 " @@ -1119,7 +1120,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: 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 " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Sawi sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: 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" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Nadobleng tipunang conf %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Sawi sa pagsulat ng tipunang %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: 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 sa pag-hash ng tipunan" @@ -1887,43 +1888,43 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sawi ang pagpili" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error sa pagsulat ng tipunang output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error sa pagsulat sa tipunan" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa tipunan" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sawi ang koneksyon" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internal na error" @@ -2469,11 +2470,11 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay sawi, %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 "Di tugmang MD5Sum" -#: 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 " @@ -2482,7 +2483,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang 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 " @@ -2491,7 +2492,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: 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." @@ -2499,7 +2500,7 @@ msgstr "" "Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Di tugmang laki" diff --git a/po/zh_CN.po b/po/zh_CN.po index d6fa9be1d..f7c0ae1b3 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 17:34+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Chinese (simplified) \n" @@ -148,7 +148,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 for %s %s ，编译于 %s %s\n" @@ -618,7 +618,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: 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 "编译正则表达式时出错 - %s" @@ -687,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (是由于 %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "【警告】：下列的重要软件包将被卸载 \n" @@ -767,11 +768,11 @@ msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: 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 "无法对下载目录加锁" -#: 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 "无法读取安装源列表。" @@ -810,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -828,7 +829,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/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 "无法下载 %s %s\n" @@ -837,7 +838,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: 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 "下载完毕，目前是“仅下载”模式" @@ -938,7 +939,7 @@ msgstr "选定了版本为 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 造成某些故障" -#: 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 "无法找到软件包 %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$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 "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: 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)." @@ -975,7 +976,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: 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" @@ -986,7 +987,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(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" @@ -995,112 +996,112 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对问题的解决有所帮助：" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "受损安装包" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "将会安装下列的额外的软件包：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: 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 "失败" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: 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 "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\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 " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: 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 " @@ -1109,30 +1110,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: 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 "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "被支持模块：" -#: 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" @@ -1378,8 +1379,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "无法写入文件 %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1730,7 +1731,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 "把文件加入散列表时出错" @@ -1857,43 +1858,43 @@ msgstr "该 http 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select 调用出错" -#: 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 "内部错误" @@ -2427,11 +2428,11 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%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 "MD5 校验和不符" -#: 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 " @@ -2440,7 +2441,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: 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 " @@ -2448,13 +2449,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: 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 "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "大小不符" diff --git a/po/zh_TW.po b/po/zh_TW.po index cafc2bd5f..f3b425929 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 是針對於 %s %s 並編譯在 %s %s\n" @@ -620,7 +620,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: 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 "編譯正規表示法出錯 - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s（因為 %s）" #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "警告：下列的重要套件都將被刪除\n" @@ -769,11 +770,11 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: 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 "無法鎖定下載的目錄" -#: 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 "無法讀取來源單。" @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -830,7 +831,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [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 "無法下載『%s』檔案。%s\n" @@ -839,7 +840,7 @@ msgstr "無法下載『%s』檔案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: 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 "下載完畢,目前是“僅下載”模式" @@ -940,7 +941,7 @@ msgstr "選定的版本為 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" @@ -954,21 +955,21 @@ msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: 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 "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$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 "用『apt-get -f install』指令或許能修正這些問題。" -#: 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)." @@ -976,7 +977,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: 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" @@ -987,7 +988,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 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" @@ -997,112 +998,112 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: 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 "失敗" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: 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 "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\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 " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: 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 " @@ -1111,30 +1112,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: 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 "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "支援模組:" -#: 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" @@ -1382,8 +1383,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1733,7 +1734,7 @@ msgstr "Data socket 連線逾時" 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 "問題雜湊表" @@ -1860,43 +1861,43 @@ msgstr "http 伺服器有損毀的範圍支援" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select 失敗" -#: 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 "內部錯誤" @@ -2425,31 +2426,31 @@ msgstr "無法寫入來源暫存檔。" msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%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 "MD5 檢查碼不符合。" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: 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 " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: 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 "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "檔案大小不符合。" diff --git a/test/conf_clear.cc b/test/conf_clear.cc new file mode 100644 index 000000000..259aa0f39 --- /dev/null +++ b/test/conf_clear.cc @@ -0,0 +1,23 @@ +#include +#include + +using namespace std; + +int main(int argc,const char *argv[]) +{ + Configuration Cnf; + + cout << "adding elements" << endl; + Cnf.Set("APT::Keep-Fds::",28); + Cnf.Set("APT::Keep-Fds::",17); + Cnf.Set("APT::Keep-Fds::",47); + Cnf.Dump(); + + cout << "Removing elements" << endl; + Cnf.Clear("APT::Keep-Fds",17); + Cnf.Clear("APT::Keep-Fds",28); + Cnf.Clear("APT::Keep-Fds",47); + Cnf.Dump(); + + return 0; +} diff --git a/test/makefile b/test/makefile index 9ad6233c2..a9dbdc34d 100644 --- a/test/makefile +++ b/test/makefile @@ -38,6 +38,12 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile SOURCE = testextract.cc include $(PROGRAM_H) +# Program for testing the config file parser +PROGRAM=conftest_clear +SLIBS = -lapt-pkg +SOURCE = conf_clear.cc +include $(PROGRAM_H) + # Program for testing the config file parser PROGRAM=conftest SLIBS = -lapt-pkg -- cgit v1.2.3 From 2a7e07c7578048abd9f7bfd4ce0ca5c3696b9f3a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Aug 2005 10:38:58 +0000 Subject: * merged from main Patches applied: * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-106 Restore lost changelog entries * apt@packages.debian.org/apt--main--0--patch-107 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-108 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-109 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-110 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1 * inital proof of concept code, understands what dpkg tells it already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2 * progress reporting works now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3 * added "APT::Status-Fd" variable * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4 * do i18n now too * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5 * define N_(x) if it is not defined already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6 * PackageManager::DoInstall(int status_fd) added (does not break the ABI) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7 * merged with apt--fixes--0 to make it build again * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8 * added support for "error" and "conffile-prompt" messages from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9 merge with main * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10 * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11 * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12 * fixed a API breakage * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13 * doc added, should be releasable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15 * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16 * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17 * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18 * clear the APT::Keep-Fds configuration when it's no longer needed * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19 * rewrote the reading from dpkg so that it never blocks * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20 * merged the two status arrays into one * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21 * added support for download progress reporting too (for Kamion and base-config) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22 * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23 * remvoed a debug string * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24 * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25 * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26 * fix a bug when out-of-order states are send from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27 * changelog update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28 * a real changelog entry now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29 * changelog finalized * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30 * propper (and sane) support for pmerror and pmconffile added --- README.progress-reporting | 62 +++ apt-pkg/acquire.cc | 21 + apt-pkg/contrib/configuration.cc | 45 ++- apt-pkg/contrib/configuration.h | 7 +- apt-pkg/contrib/fileutl.cc | 24 +- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/deb/dpkgpm.cc | 242 +++++++++-- apt-pkg/deb/dpkgpm.h | 9 +- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/packagemanager.cc | 12 + apt-pkg/packagemanager.h | 7 +- cmdline/apt-get.cc | 22 +- configure.in | 2 +- debian/apt-doc.docs | 1 + debian/apt.manpages | 1 + debian/changelog | 280 ++++++++++++- doc/examples/configure-index | 8 + methods/gpgv.cc | 30 +- methods/makefile | 2 +- po/apt-all.pot | 297 +++++++------- po/bs.po | 130 +++--- po/ca.po | 295 ++++++++------ po/cs.po | 131 +++--- po/cy.po | 841 +++++++++++++++++++++++---------------- po/da.po | 141 +++---- po/de.po | 152 +++---- po/el.po | 157 ++++---- po/en_GB.po | 132 +++--- po/es.po | 131 +++--- po/eu.po | 121 +++--- po/fi.po | 131 +++--- po/fr.po | 266 ++++++------- po/he.po | 134 +++---- po/hu.po | 131 +++--- po/it.po | 131 +++--- po/ja.po | 131 +++--- po/ko.po | 131 +++--- po/nb.po | 131 +++--- po/nl.po | 131 +++--- po/nn.po | 131 +++--- po/pl.po | 131 +++--- po/pt.po | 165 ++++---- po/pt_BR.po | 54 +-- po/ro.po | 131 +++--- po/ru.po | 131 +++--- po/sk.po | 183 ++++----- po/sl.po | 131 +++--- po/sv.po | 131 +++--- po/tl.po | 131 +++--- po/zh_CN.po | 131 +++--- po/zh_TW.po | 131 +++--- test/conf_clear.cc | 23 ++ test/makefile | 6 + 54 files changed, 3548 insertions(+), 2688 deletions(-) create mode 100644 README.progress-reporting create mode 100644 debian/apt-doc.docs create mode 100644 test/conf_clear.cc (limited to 'cmdline') diff --git a/README.progress-reporting b/README.progress-reporting new file mode 100644 index 000000000..73fbd8c08 --- /dev/null +++ b/README.progress-reporting @@ -0,0 +1,62 @@ +Install-progress reporting +-------------------------- + +If the apt options: "APT::Status-Fd" is set, apt will send status +reports to that fd. The status information is seperated with a ':', +there are the following status conditions: + +status = {"pmstatus", "dlstatus", "conffile-prompt", "error" } + +The reason for using a fd instead of a OpProgress class is that many +apt frontend fork a (vte) terminal for the actual installation. + +The reason to do the mapping and l10n of the dpkg states to human +readable (and translatable) strings is that this way the translation +needs to be done only once for all frontends. + + +pmstatus +-------- +Status of the package manager (dpkg). This is send when packages +are installed/removed. +pmstatus:pkgname:TotalPercentage:action-description + +PkgName = the name of the package +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + + +Example: +# ./apt-get install -o APT::Status-Fd=2 3dchess >/dev/null +pmstatus:3dchess:20:Preparing 3dchess +pmstatus:3dchess:40:Unpacking 3dchess +pmstatus:3dchess:60:Preparing to configure 3dchess +pmstatus:3dchess:80:Configuring 3dchess +pmstatus:3dchess:100:Installed 3dchess + +pmerror +------- +pmerror:deb:TotalPercentage:error string + +Example: +pmerror: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : 75% : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + + +pmconffile +---------- +pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedited + + + +dlstatus +-------- +dlstatus:AlreadDownloaded:TotalPercentage:action-description + +AlreadyDownloaded = the number of already downloaded packages +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + +Example: +dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining) +dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining) +dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining) \ No newline at end of file diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 70dce4f54..62209e65b 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -803,6 +804,26 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) Time = NewTime; } + int fd = _config->FindI("APT::Status-Fd",-1); + if(fd > 0) + { + ostringstream status; + + char msg[200]; + long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems; + unsigned long ETA = + (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); + + snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + + // build the status str + status << "dlstatus:" << i + << ":" << (CurrentBytes/float(TotalBytes)*100.0) + << ":" << msg + << endl; + write(fd, status.str().c_str(), status.str().size()); + } + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 69f8d1dca..09e454be9 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -325,6 +325,47 @@ void Configuration::Set(const char *Name,int Value) char S[300]; snprintf(S,sizeof(S),"%i",Value); Itm->Value = S; +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, int Value) +{ + char S[300]; + snprintf(S,sizeof(S),"%i",Value); + Clear(Name, S); +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, string Value) +{ + Item *Top = Lookup(Name.c_str(),false); + if (Top == 0 || Top->Child == 0) + return; + + Item *Tmp, *Prev, *I; + Prev = I = Top->Child; + + while(I != NULL) + { + if(I->Value == Value) + { + Tmp = I; + // was first element, point parent to new first element + if(Top->Child == Tmp) + Top->Child = I->Next; + I = I->Next; + Prev->Next = I; + delete Tmp; + } else { + Prev = I; + I = I->Next; + } + } + } /*}}}*/ // Configuration::Clear - Clear an entire tree /*{{{*/ @@ -333,9 +374,9 @@ void Configuration::Set(const char *Name,int Value) void Configuration::Clear(string Name) { Item *Top = Lookup(Name.c_str(),false); - if (Top == 0) + if (Top == 0) return; - + Top->Value = string(); Item *Stop = Top; Top = Top->Child; diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0ed8f59d3..789bc82cf 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -87,8 +87,13 @@ class Configuration bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; + // clear a whole tree void Clear(string Name); - + + // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") + void Clear(string List, string Value); + void Clear(string List, int Value); + inline const Item *Tree(const char *Name) const {return Lookup(Name);}; inline void Dump() { Dump(std::clog); }; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0ce0c9b9d..9fd71728e 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -32,6 +33,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -306,7 +308,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout) /* This is used if you want to cleanse the environment for the forked child, it fixes up the important signals and nukes all of the fds, otherwise acts like normal fork. */ -pid_t ExecFork(int dontCloseThisFd) +pid_t ExecFork() { // Fork off the process pid_t Process = fork(); @@ -326,11 +328,27 @@ pid_t ExecFork(int dontCloseThisFd) signal(SIGWINCH,SIG_DFL); signal(SIGCONT,SIG_DFL); signal(SIGTSTP,SIG_DFL); - + + set KeepFDs; + Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + int fd = atoi(Opts->Value.c_str()); + KeepFDs.insert(fd); + } + } + // Close all of our FDs - just in case for (int K = 3; K != 40; K++) - if(K != dontCloseThisFd) + { + if(KeepFDs.find(K) == KeepFDs.end()) fcntl(K,F_SETFD,FD_CLOEXEC); + } } return Process; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 4716e261e..041aa3309 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -87,7 +87,7 @@ string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); -pid_t ExecFork(int dontCloseThisFd=-1); +pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); // File string manipulators diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 61c48dcbb..fe8fbca74 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,7 +25,11 @@ #include #include #include -#include +#include +#include + +#include +#include /*}}}*/ using namespace std; @@ -325,8 +329,14 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) /*}}}*/ // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- -/* This globs the operations and calls dpkg */ -bool pkgDPkgPM::Go(int status_fd) +/* This globs the operations and calls dpkg + * + * If it is called with "OutStatusFd" set to a valid file descriptor + * apt will report the install progress over this fd. It maps the + * dpkg states a package goes through to human readable (and i10n-able) + * names and calculates a percentage for each step. +*/ +bool pkgDPkgPM::Go(int OutStatusFd) { unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); @@ -336,7 +346,66 @@ bool pkgDPkgPM::Go(int status_fd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; + + // prepare the progress reporting + int Done = 0; + int Total = 0; + // map the dpkg states to the operations that are performed + // (this is sorted in the same way as Item::Ops) + static const struct DpkgState DpkgStatesOpMap[][5] = { + // Install operation + { + {"half-installed", _("Preparing %s")}, + {"unpacked", _("Unpacking %s") }, + {NULL, NULL} + }, + // Configure operation + { + {"unpacked",_("Preparing to configure %s") }, + {"half-configured", _("Configuring %s") }, + { "installed", _("Installed %s")}, + {NULL, NULL} + }, + // Remove operation + { + {"half-configured", _("Preparing for removal of %s")}, + {"half-installed", _("Removing %s")}, + {"config-files", _("Removed %s")}, + {NULL, NULL} + }, + // Purge operation + { + {"config-files", _("Preparing for remove with config %s")}, + {"not-installed", _("Removed with config %s")}, + {NULL, NULL} + }, + }; + // the dpkg states that the pkg will run through, the string is + // the package, the vector contains the dpkg states that the package + // will go through + map > PackageOps; + // the dpkg states that are already done; the string is the package + // the int is the state that is already done (e.g. a package that is + // going to be install is already in state "half-installed") + map PackageOpsDone; + + // init the PackageOps map, go over the list of packages that + // that will be [installed|configured|removed|purged] and add + // them to the PackageOps map (the dpkg states it goes through) + // and the PackageOpsTranslations (human readable strings) + for (vector::iterator I = List.begin(); I != List.end();I++) + { + string name = (*I).Pkg.Name(); + PackageOpsDone[name] = 0; + for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) + { + PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); + Total++; + } + } + + // this loop is runs once per operation for (vector::iterator I = List.begin(); I != List.end();) { vector::iterator J = I; @@ -367,16 +436,15 @@ bool pkgDPkgPM::Go(int status_fd) } } - // if we got a status_fd argument, we pass it to apt char status_fd_buf[20]; - if(status_fd > 0) - { - Args[n++] = "--status-fd"; - Size += strlen(Args[n-1]); - snprintf(status_fd_buf,20,"%i",status_fd); - Args[n++] = status_fd_buf; - Size += strlen(Args[n-1]); - } + int fd[2]; + pipe(fd); + + Args[n++] = "--status-fd"; + Size += strlen(Args[n-1]); + snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]); + Args[n++] = status_fd_buf; + Size += strlen(Args[n-1]); switch (I->Op) { @@ -449,17 +517,17 @@ bool pkgDPkgPM::Go(int status_fd) it doesn't die but we do! So we must also ignore it */ sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); - - // Fork dpkg + + // Fork dpkg pid_t Child; - if(status_fd > 0) - Child = ExecFork(status_fd); - else - Child = ExecFork(); + _config->Set("APT::Keep-Fds::",fd[1]); + Child = ExecFork(); // This is the child if (Child == 0) { + close(fd[0]); // close the read end of the pipe + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -487,19 +555,141 @@ bool pkgDPkgPM::Go(int status_fd) _exit(100); } + // clear the Keep-Fd again + _config->Clear("APT::Keep-Fds",fd[1]); + // Wait for dpkg int Status = 0; - while (waitpid(Child,&Status,0) != Child) - { - if (errno == EINTR) + + // we read from dpkg here + int _dpkgin = fd[0]; + fcntl(_dpkgin, F_SETFL, O_NONBLOCK); + close(fd[1]); // close the write end of the pipe + + // the read buffers for the communication with dpkg + char line[1024] = {0,}; + char buf[2] = {0,0}; + + // the result of the waitpid call + int res; + + while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { + if(res < 0) { + // FIXME: move this to a function or something, looks ugly here + // error handling, waitpid returned -1 + if (errno == EINTR) + continue; + RunScripts("DPkg::Post-Invoke"); + + // Restore sig int/quit + signal(SIGQUIT,old_SIGQUIT); + signal(SIGINT,old_SIGINT); + return _error->Errno("waitpid","Couldn't wait for subprocess"); + } + + // read a single char, make sure that the read can't block + // (otherwise we may leave zombies) + int len = read(_dpkgin, buf, 1); + + // nothing to read, wait a bit for more + if(len <= 0) + { + usleep(1000); continue; - RunScripts("DPkg::Post-Invoke"); + } + + // sanity check (should never happen) + if(strlen(line) >= sizeof(line)-10) + { + _error->Error("got a overlong line from dpkg: '%s'",line); + line[0]=0; + } + // append to line, check if we got a complete line + strcat(line, buf); + if(buf[0] != '\n') + continue; + + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; + + // the status we output + ostringstream status; + + /* dpkg sends strings like this: + 'status: : ' + errors look like this: + 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + and conffile-prompt like this + 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + + */ + char* list[4]; + TokSplitString(':', line, list, 5); + char *pkg = list[1]; + char *action = _strstrip(list[2]); + + if(strncmp(action,"error",strlen("error")) == 0) + { + status << "pmerror:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + line[0]=0; + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + continue; + } + if(strncmp(action,"conffile",strlen("conffile")) == 0) + { + status << "pmconffile:" << list[1] + << ":" << (Done/float(Total)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + line[0]=0; + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + continue; + } + + vector &states = PackageOps[pkg]; + const char *next_action = NULL; + if(PackageOpsDone[pkg] < states.size()) + next_action = states[PackageOpsDone[pkg]].state; + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // only read the translation if there is actually a next + // action + const char *translation = states[PackageOpsDone[pkg]].str; + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + Done++; + // build the status str + status << "pmstatus:" << pkg + << ":" << (Done/float(Total)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; - // Restore sig int/quit - signal(SIGQUIT,old_SIGQUIT); - signal(SIGINT,old_SIGINT); - return _error->Errno("waitpid","Couldn't wait for subprocess"); + // reset the line buffer + line[0]=0; } + close(_dpkgin); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 8bfdff5eb..0b181dc43 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -23,6 +23,13 @@ using std::vector; class pkgDPkgPM : public pkgPackageManager { protected: + + // used for progress reporting + struct DpkgState + { + const char *state; // the dpkg state (e.g. "unpack") + const char *str; // the human readable translation of the state + }; struct Item { @@ -45,7 +52,7 @@ class pkgDPkgPM : public pkgPackageManager virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); virtual bool Remove(PkgIterator Pkg,bool Purge = false); - virtual bool Go(int status_fd=-1); + virtual bool Go(int StatusFd=-1); virtual void Reset(); public: diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 74ac3a7ca..8255b406a 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 5 +#define APT_PKG_MINOR 11 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 8de7d945e..0e6aecc65 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.10 +MAJOR=3.11 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 71a0dd034..87a21004f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -627,3 +627,15 @@ 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(int statusFd) +{ + if(DoInstallPreFork() == Failed) + return Failed; + + return DoInstallPostFork(); +} + /*}}}*/ diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index f95b2ab56..48f53576c 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -83,12 +83,7 @@ class pkgPackageManager : protected pkgCache::Namespace pkgRecords *Recs); // Do the installation - OrderResult DoInstall() { - if(DoInstallPreFork() == Failed) - return Failed; - - return DoInstallPostFork(); - } + OrderResult DoInstall(int statusFd=-1); // stuff that needs to be done before the fork() of a library that // uses apt diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index cb8fc7724..ac0d56073 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -689,7 +689,7 @@ static bool CheckAuth(pkgAcquire& Fetcher) if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) { - c2out << "Authentication warning overridden.\n"; + c2out << _("Authentication warning overridden.\n"); return true; } @@ -751,7 +751,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (Cache->BrokenCount() != 0) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, InstallPackages was called with broken packages!"); + return _error->Error(_("Internal error, InstallPackages was called with broken packages!")); } if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && @@ -766,11 +766,12 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (_config->FindB("APT::Get::Simulate") == true) { pkgSimulate PM(Cache); - pkgPackageManager::OrderResult Res = PM.DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM.DoInstall(status_fd); if (Res == pkgPackageManager::Failed) return false; if (Res != pkgPackageManager::Completed) - return _error->Error("Internal error, Ordering didn't finish"); + return _error->Error(_("Internal error, Ordering didn't finish")); return true; } @@ -811,7 +812,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << endl; - c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl; + c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << endl; } // Number of bytes @@ -841,7 +842,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, struct statvfs Buf; string OutputDir = _config->FindDir("Dir::Cache::Archives"); if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s."), @@ -995,7 +996,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, } _system->UnLock(); - pkgPackageManager::OrderResult Res = PM->DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); if (Res == pkgPackageManager::Failed || _error->PendingError() == true) return false; if (Res == pkgPackageManager::Completed) @@ -1790,7 +1792,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Fix.Resolve() == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } } @@ -1798,7 +1800,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (pkgAllUpgrade(Cache) == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } return InstallPackages(Cache,false); @@ -1969,7 +1971,7 @@ bool DoSource(CommandLine &CmdL) struct statvfs Buf; string OutputDir = "."; if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s"), diff --git a/configure.in b/configure.in index 39dc6a988..614c41352 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.39ubuntu4mvo1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.40.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs new file mode 100644 index 000000000..a7507f4e7 --- /dev/null +++ b/debian/apt-doc.docs @@ -0,0 +1 @@ +README.progress-reporting \ No newline at end of file diff --git a/debian/apt.manpages b/debian/apt.manpages index 7a15245d4..e621e1c49 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8 doc/fr/apt-cdrom.fr.8 doc/fr/apt-config.fr.8 doc/fr/apt-get.fr.8 +doc/fr/apt-key.fr.8 doc/fr/apt.conf.fr.5 doc/fr/apt_preferences.fr.5 doc/fr/sources.list.fr.5 diff --git a/debian/changelog b/debian/changelog index a11b4ab31..af57cc2b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,35 @@ -apt (0.6.39ubuntu4mvo1) unstable; urgency=low +apt (0.6.40.2) unstable; urgency=low - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - 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 - - support for automatic removal of unused dependencies added + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * automatic removal of unused dependencies + + -- Michael Vogt Thu, 18 Aug 2005 11:09:25 +0200 + +apt (0.6.40.1) unstable; urgency=low + + * bugfix in the parsing code for the apt<->dpkg communication. apt + crashed when dpkg sends the same state more than once under certain + conditions + * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ + + -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 + +apt (0.6.40) unstable; urgency=low - -- Michael Vogt Wed, 29 Jun 2005 13:01:36 +0200 + * Patch from Jordi Mallach to mark some additional strings for translation + * Updated Catalan translation from Jordi Mallach + * Merge from bubulle@debian.org--2005/apt--main--0: + - Update pot and merge with *.po + - Updated French translation, including apt-key.fr.8 + * Restore changelog entries from the 0.6.x series that went to Debian + experimental + * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 + - Provide an interface for progress reporting which can be used by + (e.g.) base-config + + -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 apt (0.6.39) unstable; urgency=low @@ -22,14 +41,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 - -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low @@ -225,6 +237,236 @@ apt (0.6.27) hoary; urgency=low -- Matt Zimmerman Mon, 13 Dec 2004 01:03:11 -0800 +apt (0.6.25) experimental; urgency=low + + * Fix handling of two-part sources for sources.list deb-src entries in + the same way that deb entries were fixed + + -- Matt Zimmerman Wed, 9 Jun 2004 05:29:50 -0700 + +apt (0.6.24) experimental; urgency=low + + * YnPrompt fixes were inadvertently left out, include them (Closes: + #249251) + + -- Matt Zimmerman Sun, 16 May 2004 14:18:53 -0700 + +apt (0.6.23) experimental; urgency=low + + * Remove obsolete pkgIterator::TargetVer() (Closes: #230159) + * Reverse test in CheckAuth to match new prompt (Closes: #248211) + + -- Matt Zimmerman Sun, 9 May 2004 21:01:58 -0700 + +apt (0.6.22) experimental; urgency=low + + * Merge 0.5.25 + * Make the unauthenticated packages prompt more intuitive (yes to + continue, default no), but require --force-yes in addition to + --assume-yes in order to override + + -- Matt Zimmerman Fri, 19 Mar 2004 13:55:35 -0800 + +apt (0.6.21) experimental; urgency=low + + * Merge 0.5.24 + + -- Matt Zimmerman Tue, 16 Mar 2004 22:52:34 -0800 + +apt (0.6.20) experimental; urgency=low + + * Merge 0.5.23 + + -- Matt Zimmerman Thu, 26 Feb 2004 17:17:02 -0800 + +apt (0.6.19) experimental; urgency=low + + * Merge 0.5.22 + * Convert apt-key(8) to docbook XML + + -- Matt Zimmerman Mon, 9 Feb 2004 15:44:49 -0800 + +apt (0.6.18) experimental; urgency=low + + * Add new Debian Archive Automatic Signing Key to the default keyring + (existing keyrings are not updated; do that yourself) + + -- Matt Zimmerman Sat, 17 Jan 2004 17:04:30 -0800 + +apt (0.6.17) experimental; urgency=low + + * Merge 0.5.21 + * Handle more IMS stuff correctly + + -- Matt Zimmerman Fri, 16 Jan 2004 10:54:25 -0800 + +apt (0.6.16) experimental; urgency=low + + * Fix some cases where the .gpg file could be left in place when it is + invalid + + -- Matt Zimmerman Fri, 9 Jan 2004 09:22:15 -0800 + +apt (0.6.15) experimental; urgency=low + + * s/Debug::Acquire::gpg/&v/ + * Honor the [vendor] syntax in sources.list again (though it is not + presently used for anything) + * Don't ship vendors.list(5) since it isn't used yet + * Revert change from 0.6.10; it was right in the first place and the + problem was apparently something else. Archive = Suite. + + -- Matt Zimmerman Mon, 5 Jan 2004 17:43:01 -0800 + +apt (0.6.14) experimental; urgency=low + + * Merge 0.5.20 + + -- Matt Zimmerman Sun, 4 Jan 2004 11:09:21 -0800 + +apt (0.6.13) experimental; urgency=low + + * Merge 0.5.19 + + -- Matt Zimmerman Sat, 3 Jan 2004 16:22:31 -0800 + +apt (0.6.12) experimental; urgency=low + + * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by + the method (as with file: and copy:). Local repositories + * Fix warning about dist name mismatch to actually print what it was + expecting + * Don't expect any particular distribution name for two-part + sources.list entries + * Merge 0.5.18 + + -- Matt Zimmerman Fri, 2 Jan 2004 13:59:00 -0800 + +apt (0.6.11) experimental; urgency=low + + * Support IMS requests of Release.gpg and Release + * This required API changes, bump the libapt-pkg version + * Copy local Release files into Dir::State::Lists + * Set IndexFile attribute when retrieving Release and Release.gpg so + that the appropriate Cache-Control headers are sent + + -- Matt Zimmerman Fri, 2 Jan 2004 10:46:17 -0800 + +apt (0.6.10) experimental; urgency=low + + * Use "Codename" (woody, sarge, etc.) to supply the value of the + "Archive" package file attribute, used to match "release a=" type + pins, rather than "Suite" (stable, testing, etc.) + + -- Matt Zimmerman Thu, 1 Jan 2004 16:56:47 -0800 + +apt (0.6.9) experimental; urgency=low + + * Another tagfile workaround + + -- Matt Zimmerman Thu, 1 Jan 2004 13:56:08 -0800 + +apt (0.6.8) experimental; urgency=low + + * Add a config option and corresponding command line option + (--allow-unauthenticated) to apt-get, to make buildd operators happy + (Closes: #225648) + + -- Matt Zimmerman Wed, 31 Dec 2003 08:28:04 -0800 + +apt (0.6.7) experimental; urgency=low + + * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully + will fix segfaults for some folks. + + -- Matt Zimmerman Wed, 31 Dec 2003 08:01:28 -0800 + +apt (0.6.6) experimental; urgency=low + + * Restore the ugly hack I removed from indexRecords::Load which set the + pkgTagFile buffer size to (file size)+256. This is concealing a bug, + but I can't fix it right now. This should fix the segfaults that + folks are seeing with 0.6.[45]. + + -- Matt Zimmerman Mon, 29 Dec 2003 18:11:13 -0800 + +apt (0.6.5) experimental; urgency=low + + * Move the authentication check into a separate function in apt-get + * Fix display of unauthenticated packages when they are in the cache + (Closes: #225336) + + -- Matt Zimmerman Sun, 28 Dec 2003 16:47:57 -0800 + +apt (0.6.4) experimental; urgency=low + + * Use the top-level Release file in LoadReleaseInfo, rather than looking + for the per-section ones (which aren't downloaded anymore). This + unbreaks release pinning, including the NotAutomatic bit used by + project/experimental + * Use FileFd::Size() rather than a separate stat() call in + LoadReleaseInfo + * Fix pkgTagFile to leave a little extra room at the end of the buffer + to append the record separator if it isn't present + * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match + the Debian archive's dist-level Release files + + -- Matt Zimmerman Sun, 28 Dec 2003 15:55:55 -0800 + +apt (0.6.3) experimental; urgency=low + + * Fix MetaIndexURI for flat ("foo/") sources + + -- Matt Zimmerman Sun, 28 Dec 2003 12:11:56 -0800 + +apt (0.6.2) experimental; urgency=low + + * Add space between package names when multiple unauthenticated packages + are being installed (Closes: #225212) + * Provide apt-key with a secret keyring and a trustdb, even though we + would never use them, because it blows up if it doesn't have them + * Fix typo in apt-key(8) (standard input is '-', not '/') + + -- Matt Zimmerman Sat, 27 Dec 2003 13:01:40 -0800 + +apt (0.6.1) experimental; urgency=low + + * Merge apt 0.5.17 + * Rearrange Release file authentication code to be more clear + * If Release is present, but Release.gpg is not, don't forget to still + queue Packages files + * Convert distribution "../project/experimental" to "experimental" for + comparison purposes + * Make a number of Release file errors into warnings; for now, it is OK + not to have a codename, for example. We mostly care about checksums + for now + + -- Matt Zimmerman Fri, 26 Dec 2003 15:12:47 -0800 + +apt (0.6.0) experimental; urgency=low + + * Signature verification support patch ("apt-secure") from Colin Walters + and Isaac Jones . This + implements: + - Release signature verification (Release.gpg) + - Packages, Sources md5sum verification against Release + - Closes: #203741 + * Make some modifications to signature verification support: + - Release.gpg is always retrieved and verified if present, rather than + requiring that sources be configured as secure + - Print a hint about installing gnupg if exec(gpgv) fails + - Remove obsolete pkgAcqIndexRel + - Move vendors.list stuff into a separate module (vendorlist.{h,cc}) + - If any files about to be retrieved are not authenticated, issue a + warning to the user and require confirmation + - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords() + * Suggests: gnupg + * Install a keyring in /usr/share/apt/debian-archive.gpg containing an + initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg + * Add a new tool, apt-key(8) used to manage the keyring + + -- Matt Zimmerman Fri, 26 Dec 2003 08:27:19 -0800 + apt (0.5.32) hoary; urgency=low * Call setlocale in the methods, so that the messages are properly diff --git a/doc/examples/configure-index b/doc/examples/configure-index index b4ac0ed4b..2c16cd31f 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -88,6 +88,13 @@ APT Force-LoopBreak "false"; // DO NOT turn this on, see the man page Cache-Limit "4194304"; Default-Release ""; + + + // Write progress messages on this fd (for stuff like base-config) + Status-Fd "-1"; + // Keep the list of FDs open (normally apt closes all fds when it + // does a ExecFork) + Keep-Fds {}; }; // Options for the downloading routines @@ -238,6 +245,7 @@ Debug pkgAcquire "false"; pkgAcquire::Worker "false"; pkgDPkgPM "false"; + pkgDPkgProgressReporting "false"; pkgOrderList "false"; pkgAutoRemove "false"; // show information about automatic removes diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 24e945b2c..5cb154f66 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -88,7 +89,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, continue; Args[i++] = Opts->Value.c_str(); if(i >= 395) { - std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl; + std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; exit(111); } } @@ -181,27 +182,28 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, waitpid(pid, &status, 0); if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv exited\n"; + std::cerr << "gpgv exited\n"; } if (WEXITSTATUS(status) == 0) { if (GoodSigners.empty()) - return "Internal error: Good signature, but could not determine key fingerprint?!"; + return _("Internal error: Good signature, but could not determine key fingerprint?!"); return NULL; } else if (WEXITSTATUS(status) == 1) { - return "At least one invalid signature was encountered."; + return _("At least one invalid signature was encountered."); } else if (WEXITSTATUS(status) == 111) { - return (string("Could not execute ") + gpgvpath + - string(" to verify signature (is gnupg installed?)")).c_str(); + // FIXME String concatenation considered harmful. + return (string(_("Could not execute ")) + gpgvpath + + string(_(" to verify signature (is gnupg installed?)"))).c_str(); } else { - return "Unknown error executing gpgv"; + return _("Unknown error executing gpgv"); } } @@ -232,14 +234,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm) { if (!BadSigners.empty()) { - errmsg += "The following signatures were invalid:\n"; + errmsg += _("The following signatures were invalid:\n"); for (vector::iterator I = BadSigners.begin(); I != BadSigners.end(); I++) errmsg += (*I + "\n"); } if (!NoPubKeySigners.empty()) { - errmsg += "The following signatures couldn't be verified because the public key is not available:\n"; + errmsg += _("The following signatures couldn't be verified because the public key is not available:\n"); for (vector::iterator I = NoPubKeySigners.begin(); I != NoPubKeySigners.end(); I++) errmsg += (*I + "\n"); @@ -251,16 +253,16 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // Transfer the modification times struct stat Buf; if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat %s", Path.c_str()); + return _error->Errno("stat",_("Failed to stat %s"), Path.c_str()); struct utimbuf TimeBuf; TimeBuf.actime = Buf.st_atime; TimeBuf.modtime = Buf.st_mtime; if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime","Failed to set modification time"); + return _error->Errno("utime",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat"); + return _error->Errno("stat",_("Failed to stat")); // Return a Done response Res.LastModified = Buf.st_mtime; @@ -275,7 +277,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv suceeded\n"; + std::cerr << "gpgv succeeded\n"; } return true; @@ -284,6 +286,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + GPGVMethod Mth; return Mth.Run(); diff --git a/methods/makefile b/methods/makefile index 06fd2a6fc..1e3b1ef85 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.10 +LIB_APT_PKG_MAJOR = 3.11 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method diff --git a/po/apt-all.pot b/po/apt-all.pot index d043210fe..d06c14ce1 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-24 21:41+0200\n" +"POT-Creation-Date: 2005-06-06 14:00+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:2369 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 "" @@ -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:712 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "" @@ -519,200 +519,200 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:119 +#: cmdline/apt-get.cc:118 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:236 +#: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:325 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:328 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:335 +#: cmdline/apt-get.cc:334 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:337 +#: cmdline/apt-get.cc:336 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:339 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:339 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:344 msgid " or" msgstr "" -#: cmdline/apt-get.cc:374 +#: cmdline/apt-get.cc:373 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:400 +#: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:443 +#: cmdline/apt-get.cc:442 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:464 +#: cmdline/apt-get.cc:463 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:484 +#: cmdline/apt-get.cc:483 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:537 +#: cmdline/apt-get.cc:536 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:544 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:576 +#: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:580 +#: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:582 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:584 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:588 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:648 +#: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:651 +#: cmdline/apt-get.cc:650 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:654 +#: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:658 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:663 +#: cmdline/apt-get.cc:662 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:666 +#: cmdline/apt-get.cc:665 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:688 +#: cmdline/apt-get.cc:687 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:699 +#: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:700 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:763 +#: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2117 +#: 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 "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:846 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:865 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -720,74 +720,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:886 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1335 cmdline/apt-get.cc:2015 +#: 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 "" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:976 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2024 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:993 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1037 +#: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1066 +#: cmdline/apt-get.cc:1065 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1078 +#: cmdline/apt-get.cc:1077 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1083 +#: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1088 +#: cmdline/apt-get.cc:1087 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -795,97 +795,79 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1107 +#: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1130 +#: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1165 +#: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1167 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1283 +#: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1296 cmdline/apt-get.cc:1431 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1354 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1367 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" - -#: 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:1392 cmdline/apt-get.cc:1594 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1396 -msgid "Internal Error, AutoRemover broke stuff" -msgstr "" - -#: cmdline/apt-get.cc:1414 +#: cmdline/apt-get.cc:1372 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1513 cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1536 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1566 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1581 +#: 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" @@ -893,145 +875,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1589 +#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1597 +#: cmdline/apt-get.cc:1552 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1628 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1700 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1723 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1728 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1901 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2165 #, 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:2217 #, 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:2252 #, 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:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1315,9 +1301,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:645 -#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 -#: apt-pkg/pkgcachegen.cc:842 +#: 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 msgid "Reading package lists" msgstr "" @@ -2021,27 +2007,18 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:64 apt-pkg/depcache.cc:96 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:65 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:97 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "" -#: 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)" @@ -2190,82 +2167,82 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:76 +#: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:119 +#: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/pkgcachegen.cc:574 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:660 +#: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "" diff --git a/po/bs.po b/po/bs.po index d4f9b1f66..806c1204d 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: 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 "" @@ -606,7 +606,7 @@ msgstr "" #: cmdline/apt-get.cc:544 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 "" @@ -684,11 +684,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "" -#: 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 "" @@ -729,7 +729,7 @@ msgstr "Da, uradi kako kažem!" #: cmdline/apt-get.cc:865 #, 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 "" @@ -743,7 +743,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/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 "" @@ -752,7 +752,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: 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 "" @@ -848,7 +848,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -862,27 +862,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: 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)." msgstr "" -#: 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" @@ -890,149 +890,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: 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 "Neuspješno" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podržani moduli:" -#: 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" @@ -1229,9 +1229,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Ne mogu ukloniti %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1578,7 +1578,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 "" @@ -1705,43 +1705,43 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: 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 "Povezivanje neuspješno" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Unutrašnja greška" @@ -2269,31 +2269,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/ca.po b/po/ca.po index 980c2ec42..7fe93910e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-15 18:53+0100\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -150,7 +150,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 per a %s %s compilat el %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,13 +377,13 @@ msgstr "" "Gestiona molts estils per a generar-los, des dels completament automàtics\n" "als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n" "\n" -"apt-ftparchive genera fitxers Package des d'un arbre de .debs. El\n" +"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n" "fitxer Package conté tots els camps de control de cada paquet així com\n" "la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n" "per a forçar el valor de Prioritat i Secció.\n" "\n" -"D'un mode semblant apt-ftparchive genera fitxers Sources des d'un arbre\n" -"de .dscs. Es pot utilitzar l'opció --source-override per a especificar un\n" +"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n" +"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n" "fitxer de substitucions de src.\n" "\n" "L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n" @@ -468,7 +467,7 @@ msgstr "E: Els errors s'apliquen al fitxer " #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 #, c-format msgid "Failed to resolve %s" -msgstr "Falla al resoldre %s" +msgstr "No s'ha pogut resoldre %s" #: ftparchive/writer.cc:164 msgid "Tree walking failed" @@ -477,7 +476,7 @@ msgstr "L'arbre està fallant" #: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" -msgstr "Falla a l'obrir %s" +msgstr "No s'ha pogut obrir %s" #: ftparchive/writer.cc:246 #, c-format @@ -487,17 +486,17 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format msgid "Failed to readlink %s" -msgstr "Falla al llegir l'enllaç %s" +msgstr "No s'ha pogut llegir l'enllaç %s" #: ftparchive/writer.cc:258 #, c-format msgid "Failed to unlink %s" -msgstr "Falla a l'alliberar %s" +msgstr "No s'ha pogut alliberar %s" #: ftparchive/writer.cc:265 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Falla a l'enllaçar %s a %s" +msgstr "*** No s'ha pogut enllaçar %s a %s" #: ftparchive/writer.cc:275 #, c-format @@ -531,7 +530,7 @@ msgstr "Error intern, no s'ha pogut localitzar al membre %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falla a l'assignar espai en memòria" +msgstr "realloc - No s'ha pogut assignar espai en memòria" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -556,7 +555,7 @@ msgstr "Línia predominant %s línia malformada %lu núm 3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Falla al llegir la línia predominant del fitxer %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" #: ftparchive/multicompress.cc:75 #, c-format @@ -587,15 +586,15 @@ msgstr "Comprimeix el fil" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Error intern, falla al crear %s" +msgstr "S'ha produït un error intern, no s'ha pogut crear %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Falla al crear el subprocés IPC" +msgstr "No s'ha pogut crear el subprocés IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Falla a l'executar el compressor " +msgstr "No s'ha pogut executar el compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -603,11 +602,11 @@ msgstr "decompressor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Falla l'E/S del subprocés sobre el fitxer" +msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Falla al llegir mentre es càlculava la suma MD5" +msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -617,16 +616,16 @@ msgstr "S'ha trobat un problema treient l'enllaç %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Ha fallat el reomenament de %s a %s" +msgstr "No s'ha pogut canviar el nom de %s a %s" #: cmdline/apt-get.cc:118 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 "Error de compilació de l'expressió regular - %s" +msgstr "S'ha produït un error de compilació de l'expressió regular - %s" #: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" @@ -693,10 +692,10 @@ msgstr "%s (per %s) " #: cmdline/apt-get.cc:544 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 "" -"ATENCIÓ: Els següents paquets essencials seran eliminats\n" +"AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" #: cmdline/apt-get.cc:575 @@ -730,7 +729,7 @@ msgstr "S'estan corregint les dependències..." #: cmdline/apt-get.cc:650 msgid " failed." -msgstr " falla." +msgstr " ha fallat." #: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" @@ -758,7 +757,7 @@ msgstr "AVÍS: No es poden autenticar els següents paquets!" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " -msgstr "Voleu instal·lar aquestas paquets sense verificar-los [y/N]? " +msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " #: cmdline/apt-get.cc:700 msgid "Some packages could not be authenticated" @@ -766,17 +765,17 @@ msgstr "No s'ha pogut autenticar alguns paquets" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i -y fou usat sense --force-yes" +msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: 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 "No és possible blocar el directori de descàrrega" -#: 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 "No s'ha pogut llegir la llista de les fonts." @@ -817,12 +816,12 @@ msgstr "Sí, fes el que et dic!" #: cmdline/apt-get.cc:865 #, 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 "" -"Esteu a punt de fer quelcom potencialment nociu\n" -"Per a continuar escriviu en la frase «%s»\n" +"Esteu a punt de fer quelcom potencialment nociu.\n" +"Per a continuar escriviu la frase «%s»\n" " ?] " #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 @@ -833,7 +832,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu 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 "No s'ha pogut obtenir %s %s\n" @@ -842,9 +841,9 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: 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 "Descàrrega completa i en mode de sols descàrrega" +msgstr "Descàrrega completa i en mode de només descàrrega" #: cmdline/apt-get.cc:983 msgid "" @@ -869,14 +868,13 @@ msgstr "S'està avortant la instal·lació." #: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota: s'ha seleccionant %s en comptes de %s\n" +msgstr "Nota: s'està seleccionant %s en comptes de %s\n" #: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"S'està ometent a %s, ja està instal·lat i l'actualització no està " -"establerta.\n" +"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" #: cmdline/apt-get.cc:1054 #, c-format @@ -946,7 +944,7 @@ msgstr "Versió seleccionada %s (%s) per a %s\n" msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" @@ -962,21 +960,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: 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 "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +982,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: 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 +994,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: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,109 +1004,109 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: 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 "Ha fallat" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\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 " @@ -1117,7 +1115,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1126,32 +1124,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falla al satisfer la dependència %s per a %s: El paquet instal·lat %s és " -"massa nou" +"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " +"és massa nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falla al satisfer la dependència %s per a %s: %s" +msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: 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" @@ -1379,15 +1377,15 @@ msgstr "DropNode crida a un node que encara està enllaçat" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Falla al localitzar l'element diseminat!" +msgstr "No s'ha trobat l'element diseminat!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Falla al localitzar la desviació" +msgstr "No s'ha pogut assignar la desviació" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "Error intern en AddDiversion" +msgstr "S'ha produït un error intern en AddDiversion" #: apt-inst/filelist.cc:481 #, c-format @@ -1406,8 +1404,8 @@ msgstr "Fitxer de conf. duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" -msgstr "Ha fallat l'escriptura del fitxer %s" +msgid "Failed to write file %s" +msgstr "No s'ha pogut escriure el fitxer %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1445,7 +1443,7 @@ msgstr "El directori %s està sent reemplaçat per un no-directori" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Falla al localitzar el node dins la taula" +msgstr "No s'ha trobat el node dins de la taula" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1485,7 +1483,7 @@ msgstr "No es pot crear %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Falla al comprovar l'estat de %sinfo" +msgstr "No s'ha pogut fer «stat» de %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" @@ -1503,12 +1501,12 @@ msgstr "S'està llegint la llista de paquets" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falla al canviar pel directori de gestió %sinfo" +msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "Error intern obtenint un nom de paquet" +msgstr "S'ha produït un error intern en obtenir un nom de paquet" #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" @@ -1521,23 +1519,23 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Falla a l'obrir la llista del fitxer '%sinfo/%s'. Si no podeu restaurar " -"aquest fitxer llavores marqueu-lo amb empty i torneu a instal·lar " -"immediatament la mateixa versió del paquet!" +"No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu restaurar " +"aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " +"versió del paquet!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falla al llegir la llista del fitxer %sinfo/%s" +msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "Error intern obtinguen un node" +msgstr "S'ha produït un error en obtenir un node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falla a l'obrir el fitxer de desviació %sdiversions" +msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" @@ -1551,7 +1549,7 @@ msgstr "Línia no vàlida en el fitxer de desviació: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "Error intern afegint una desviació" +msgstr "S'ha produït un error intern en afegir una desviació" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" @@ -1564,7 +1562,7 @@ msgstr "S'està llegint la llista de fitxers" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falla al cercar un paquet: Capçalera, desplaçament %lu" +msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format @@ -1574,12 +1572,12 @@ msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Error analitzant la suma MD5. Desplaçament %lu" +msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Aquest no és un arxiu DEB vàlid, falta el membre '%s'" +msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" #: apt-inst/deb/debfile.cc:52 #, c-format @@ -1593,15 +1591,15 @@ msgstr "No s'ha pogut canviar a %s" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "Error intern, no s'ha pogut localitzar al membre" +msgstr "S'ha produït un error intern, no s'ha trobat el membre" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "S'ha fallat en localitzar un fitxer de control vàlid" +msgstr "No s'ha trobat un fitxer de control vàlid" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Fitxer de control incoherent" +msgstr "El fitxer de control no es pot analitzar" #: methods/cdrom.cc:113 #, c-format @@ -1635,7 +1633,7 @@ msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Falla a l'establir la modificació de temps" +msgstr "No s'ha pogut establir el temps de modificació" #: methods/file.cc:42 msgid "Invalid URI, local URIS must not start with //" @@ -1762,7 +1760,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: 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 escollint el fitxer" @@ -1889,43 +1887,43 @@ msgstr "Aquest servidor http té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error intern" @@ -2070,7 +2068,7 @@ msgstr "No es pot canviar a %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Falla al examinar el cdrom" +msgstr "No s'ha pogut fer «stat» del cdrom" #: apt-pkg/contrib/fileutl.cc:80 #, c-format @@ -2100,7 +2098,7 @@ msgstr "Esperava %s però no hi era" #: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-procés %s ha rebut una falla de segmentació." +msgstr "Sub-procés %s ha rebut una violació de segment." #: apt-pkg/contrib/fileutl.cc:372 #, c-format @@ -2465,13 +2463,13 @@ msgstr "Error d'E/S en desar la memòria cau de la font" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "falla de renomenat, %s (%s -> %s)." +msgstr "no s'ha pogut canviar el 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 "Suma MD5 diferent" -#: 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 " @@ -2481,7 +2479,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: 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 " @@ -2490,7 +2488,7 @@ msgstr "" "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." -#: 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." @@ -2498,7 +2496,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Mida diferent" @@ -2603,6 +2601,63 @@ msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" +#~ msgid "Authentication warning overridden.\n" +#~ msgstr "S'ha descartat l'avís d'autenticació.\n" + +#~ 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!" + +#~ msgid "Internal error, Ordering didn't finish" +#~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + +#~ 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" + +#~ msgid "Couldn't determine free space in %s" +#~ msgstr "No s'ha pogut determinar l'espai lliure en %s" + +#~ msgid "Internal error, problem resolver broke stuff" +#~ msgstr "" +#~ "S'ha produït un error intern, el solucionador de problemes ha trencat " +#~ "coses" + +#~ 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." + +#~ 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!" + +#~ msgid "At least one invalid signature was encountered." +#~ msgstr "S'ha trobat almenys una signatura invàlida." + +#~ msgid "Could not execute " +#~ msgstr "No s'ha pogut executar " + +#~ msgid " to verify signature (is gnupg installed?)" +#~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + +#~ msgid "Unknown error executing gpgv" +#~ msgstr "S'ha produït un error desconegut en executar el gpgv" + +#~ msgid "The following signatures were invalid:\n" +#~ msgstr "Les següents signatures són invàlides:\n" + +#~ msgid "" +#~ "The following signatures couldn't be verified because the public key is " +#~ "not available:\n" +#~ msgstr "" +#~ "Les següents signatures no s'han pogut verificar perquè la clau pública " +#~ "no està disponible:\n" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s" diff --git a/po/cs.po b/po/cs.po index 7dceb8c07..28f683d1a 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -147,7 +147,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 pro %s %s zkompilován na %s %s\n" @@ -617,7 +617,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: 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 "Chyba při kompilaci regulárního výrazu - %s" @@ -686,8 +686,9 @@ msgid "%s (due to %s) " msgstr "%s (kvůli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" @@ -766,11 +767,11 @@ msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" 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: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 "Nemohu zamknout adresář pro stahování" -#: 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 "Nelze přečíst seznam zdrojů." @@ -809,9 +810,9 @@ msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -827,7 +828,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/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 "Selhalo stažení %s %s\n" @@ -836,7 +837,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: 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 "Stahování dokončeno v režimu pouze stáhnout" @@ -937,7 +938,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: 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 "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -975,7 +976,7 @@ msgstr "" "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: 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" @@ -986,7 +987,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: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" @@ -996,114 +997,114 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci..." -#: 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 "Selhalo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Stažení některých archívů selhalo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\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 " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: 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 " @@ -1112,31 +1113,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: 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" @@ -1383,8 +1384,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Selhal zápis do souboru %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1737,7 +1738,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: 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 "Problém s hashováním souboru" @@ -1864,43 +1865,43 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2436,11 +2437,11 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %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 "Neshoda MD5 součtů" -#: 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 " @@ -2449,7 +2450,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: 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 " @@ -2458,14 +2459,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: 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 "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" diff --git a/po/cy.po b/po/cy.po index d8360fc3f..219125086 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: 2004-04-29 21:56-0700\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -14,145 +14,163 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:133 +#: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613 -#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355 -#: cmdline/apt-cache.cc:1506 +#: 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 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:230 -msgid "Total Package Names : " +#: cmdline/apt-cache.cc:232 +#, fuzzy +msgid "Total package names : " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:270 -msgid " Normal Packages: " +#: cmdline/apt-cache.cc:272 +#, fuzzy +msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:271 -msgid " Pure Virtual Packages: " +#: cmdline/apt-cache.cc:273 +#, fuzzy +msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:272 -msgid " Single Virtual Packages: " +#: cmdline/apt-cache.cc:274 +#, fuzzy +msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:273 -msgid " Mixed Virtual Packages: " +#: cmdline/apt-cache.cc:275 +#, fuzzy +msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:276 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:276 -msgid "Total Distinct Versions: " +#: cmdline/apt-cache.cc:278 +#, fuzzy +msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:278 -msgid "Total Dependencies: " +#: cmdline/apt-cache.cc:280 +#, fuzzy +msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:281 -msgid "Total Ver/File relations: " +#: cmdline/apt-cache.cc:283 +#, fuzzy +msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:283 -msgid "Total Provides Mappings: " +#: cmdline/apt-cache.cc:285 +#, fuzzy +msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:295 -msgid "Total Globbed Strings: " +#: cmdline/apt-cache.cc:297 +#, fuzzy +msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:309 -msgid "Total Dependency Version space: " +#: cmdline/apt-cache.cc:311 +#, fuzzy +msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:314 -msgid "Total Slack space: " +#: cmdline/apt-cache.cc:316 +#, fuzzy +msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:322 -msgid "Total Space Accounted for: " +#: cmdline/apt-cache.cc:324 +#, fuzzy +msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1229 +#: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1383 +#: cmdline/apt-cache.cc:1385 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1460 -msgid "Package Files:" +#: cmdline/apt-cache.cc:1462 +#, fuzzy +msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1468 +#: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1480 -msgid "Pinned Packages:" +#: cmdline/apt-cache.cc:1482 +#, fuzzy +msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1513 +#: cmdline/apt-cache.cc:1515 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1520 +#: cmdline/apt-cache.cc:1522 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1530 -msgid " Package Pin: " +#: cmdline/apt-cache.cc:1532 +#, fuzzy +msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1539 -msgid " Version Table:" +#: cmdline/apt-cache.cc:1541 +#, fuzzy +msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70 +#: 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:2299 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 ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1588 +#: cmdline/apt-cache.cc:1658 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -187,7 +205,7 @@ msgid "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Defnydd: apt-cache [opsiynnau] gorchymyn\n" @@ -231,6 +249,7 @@ msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" #: cmdline/apt-config.cc:76 +#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -243,8 +262,9 @@ msgid "" "Options:\n" " -h This help text.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" -msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-config [opsiynnau] gorchymyn\n" "\n" "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n" "\n" @@ -264,6 +284,7 @@ msgstr "Nid yw %s yn becyn DEB dilys." # FIXME: "debian" #: cmdline/apt-extracttemplates.cc:232 +#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -274,7 +295,7 @@ msgid "" " -h This help text\n" " -t Set the temp dir\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" "\n" @@ -303,8 +324,8 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." #: 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 -#, c-format -msgid "Error Processing directory %s" +#, fuzzy, c-format +msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" #: ftparchive/apt-ftparchive.cc:250 @@ -316,12 +337,13 @@ msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" #: ftparchive/apt-ftparchive.cc:397 -#, c-format -msgid "Error Processing Contents %s" +#, fuzzy, c-format +msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -360,7 +382,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" "Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" @@ -372,8 +394,7 @@ msgstr "" "\n" "Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" "Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a " -"dpkg-scansources.\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" "\n" "Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" "Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" @@ -502,27 +523,32 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: 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 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/writer.cc:372 +#: ftparchive/writer.cc:378 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:380 ftparchive/writer.cc:589 +#: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:423 ftparchive/writer.cc:671 +#: ftparchive/writer.cc:429 ftparchive/writer.cc:677 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +#: ftparchive/contents.cc:317 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -552,8 +578,8 @@ msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" #: ftparchive/multicompress.cc:105 @@ -574,12 +600,13 @@ msgid "Failed to fork" msgstr "Methodd fork()" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +#, fuzzy +msgid "Compress child" msgstr "Plentyn Cywasgu" #: ftparchive/multicompress.cc:238 -#, c-format -msgid "Internal Error, Failed to create %s" +#, fuzzy, c-format +msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" #: ftparchive/multicompress.cc:289 @@ -616,7 +643,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -664,15 +691,18 @@ msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" #: cmdline/apt-get.cc:421 -msgid "The following packages have been kept back" +#, fuzzy +msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" #: cmdline/apt-get.cc:442 -msgid "The following packages will be upgraded" +#, fuzzy +msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" #: cmdline/apt-get.cc:463 -msgid "The following packages will be DOWNGRADED" +#, fuzzy +msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" #: cmdline/apt-get.cc:483 @@ -685,8 +715,9 @@ msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" @@ -747,67 +778,74 @@ msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." #: cmdline/apt-get.cc:687 -msgid "WARNING: The following packages cannot be securely authenticated!" +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" #: cmdline/apt-get.cc:698 -msgid "Abort? [Y/n] " -msgstr "Erthylu? [I/n] " +msgid "Install these packages without verification [y/N]? " +msgstr "" + +#: cmdline/apt-get.cc:700 +#, fuzzy +msgid "Some packages could not be authenticated" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:755 -msgid "Packages need to be removed but Remove is disabled." +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: cmdline/apt-get.cc:762 +#, 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:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047 +#: 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 "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:811 +#: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:826 #, 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:822 +#: cmdline/apt-get.cc:829 #, 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:839 +#: cmdline/apt-get.cc:846 #, 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:848 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" - -#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 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:856 +#: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:858 -#, c-format +#: cmdline/apt-get.cc:865 +#, fuzzy, 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 "" @@ -815,28 +853,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:879 -msgid "Do you want to continue? [Y/n] " +#: cmdline/apt-get.cc:886 +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945 +#: 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 "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:972 +#: cmdline/apt-get.cc:976 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -844,103 +883,103 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:987 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:988 +#: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:989 -msgid "Aborting Install." +#: cmdline/apt-get.cc:993 +#, fuzzy +msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1022 +#: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1032 +#: cmdline/apt-get.cc:1036 #, 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:1050 +#: cmdline/apt-get.cc:1054 #, 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:1061 +#: cmdline/apt-get.cc:1065 #, 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:1073 +#: cmdline/apt-get.cc:1077 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1078 +#: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1083 -#, c-format +#: cmdline/apt-get.cc:1087 +#, fuzzy, c-format msgid "" -"Package %s has no available version, but exists in the database.\n" -"This typically means that the package was mentioned in a dependency and\n" -"never uploaded, has been obsoleted or is not available with the contents\n" -"of sources.list\n" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1103 +#: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1126 +#: cmdline/apt-get.cc:1129 #, 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:1134 +#: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1169 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1292 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1344 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -948,26 +987,27 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1363 -msgid "Internal Error, AllUpgrade broke stuff" +#: cmdline/apt-get.cc:1372 +#, fuzzy +msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1476 +#: cmdline/apt-get.cc:1494 #, 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:1506 +#: cmdline/apt-get.cc:1524 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:1509 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +1016,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1521 +#: 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" @@ -989,7 +1029,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1529 +#: 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" @@ -998,147 +1038,153 @@ 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:1534 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1563 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1630 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1650 -msgid "Calculating Upgrade... " +#: cmdline/apt-get.cc:1673 +#, fuzzy +msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1854 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:1858 cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1905 +#: cmdline/apt-get.cc:1928 #, 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:1910 +#: cmdline/apt-get.cc:1933 #, 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:1913 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1919 -#, c-format -msgid "Fetch Source %s\n" +#: cmdline/apt-get.cc:1942 +#, fuzzy, c-format +msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:1978 +#: cmdline/apt-get.cc:2001 #, 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:1990 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2007 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2026 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2042 +#: cmdline/apt-get.cc:2065 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" +msgstr "" +"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2093 #, 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:2090 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2142 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" +"s" -#: cmdline/apt-get.cc:2194 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" 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" +"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:2229 +#: cmdline/apt-get.cc:2252 #, 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" +msgstr "" +"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " +"newydd" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2304 -msgid "Supported Modules:" +#: cmdline/apt-get.cc:2327 +#, fuzzy +msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2368 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1174,7 +1220,7 @@ msgid "" " -b Build the source package after fetching it\n" " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" @@ -1242,13 +1288,14 @@ msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 +#, c-format msgid " [Working]" msgstr " [Gweithio]" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1261,6 +1308,7 @@ msgid "Unknown package record!" msgstr "Cofnod pecyn anhysbys!" #: cmdline/apt-sortpkgs.cc:150 +#, fuzzy msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" "\n" @@ -1271,7 +1319,7 @@ msgid "" " -h This help text\n" " -s Use source file sorting\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" "\n" @@ -1313,26 +1361,28 @@ msgstr "" "eto." #: dselect/update:30 -msgid "Merging Available information" +#, fuzzy +msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/contrib/extracttar.cc:115 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:140 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:192 -msgid "Tar Checksum failed, archive corrupted" +#: apt-inst/contrib/extracttar.cc:195 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:295 +#: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -1370,7 +1420,8 @@ msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +#, fuzzy +msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" #: apt-inst/filelist.cc:481 @@ -1390,8 +1441,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1426,7 +1477,8 @@ msgstr "Mae llwybr y dargyfeiriad yn rhy hir" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1481,7 +1533,8 @@ msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #: 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 -msgid "Reading Package Lists" +#, fuzzy +msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" #: apt-inst/deb/dpkgdb.cc:180 @@ -1492,11 +1545,13 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" # FIXME #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +#, fuzzy +msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +#, fuzzy +msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:216 @@ -1516,7 +1571,8 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +#, fuzzy +msgid "Internal error getting a node" msgstr "Gwall Mewnol wrth gael Nôd" # FIXME: literal @@ -1536,20 +1592,23 @@ msgid "Invalid line in the diversion file: %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +#, fuzzy +msgid "Internal error adding a diversion" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +#, fuzzy +msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +#, fuzzy +msgid "Reading file list" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:443 -#, c-format -msgid "Failed to find a Package: Header, offset %lu" +#, fuzzy, c-format +msgid "Failed to find a Package: header, offset %lu" msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" #: apt-inst/deb/dpkgdb.cc:465 @@ -1562,31 +1621,33 @@ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#: apt-inst/deb/debfile.cc:55 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:72 -#, c-format -msgid "Internal Error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +#: apt-inst/deb/debfile.cc:52 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:104 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" -#: apt-inst/deb/debfile.cc:125 -msgid "Internal Error, could not locate member" +#: apt-inst/deb/debfile.cc:138 +#, fuzzy +msgid "Internal error, could not locate member" msgstr "Gwall Methwyd, methwyd lleoli aelod" -#: apt-inst/deb/debfile.cc:158 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:243 -msgid "Unparsible control file" +#: apt-inst/deb/debfile.cc:256 +#, fuzzy +msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" #: methods/cdrom.cc:113 @@ -1595,24 +1656,26 @@ msgid "Unable to read the cdrom database %s" msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" #: methods/cdrom.cc:122 +#, fuzzy msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" -"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio " -"apt-get update i ychwanegu CDau newydd." +"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-" +"get update i ychwanegu CDau newydd." #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +#, fuzzy +msgid "Wrong CD-ROM" msgstr "CD Anghywir" #: methods/cdrom.cc:163 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei " -"ddefnyddio." +msgstr "" +"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -1642,8 +1705,8 @@ msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" #: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "Server refused our connection and said: %s" +#, fuzzy, c-format +msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" #: methods/ftp.cc:210 @@ -1661,8 +1724,8 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae " -"Acquire::ftp::ProxyLogin yn wag.)" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" # FIXME #: methods/ftp.cc:265 @@ -1683,7 +1746,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" msgstr "Gwall darllen" @@ -1695,9 +1758,9 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 methods/rsh.cc:232 -msgid "Write Error" -msgstr "Gwall Ysgrifennu" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" +msgstr "Gwall ysgrifennu" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1708,7 +1771,8 @@ msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" #: methods/ftp.cc:704 -msgid "Could not connect passive socket" +#, fuzzy +msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME @@ -1750,7 +1814,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1774,7 +1838,7 @@ msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1104 +#: methods/ftp.cc:1106 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1845,79 +1909,89 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:340 +#: methods/http.cc:344 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:486 +#: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:494 +#: methods/http.cc:498 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:513 methods/http.cc:520 -msgid "The http server sent an invalid reply header" +#: methods/http.cc:517 methods/http.cc:524 +#, fuzzy +msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:549 -msgid "The http server sent an invalid Content-Length header" +#: methods/http.cc:553 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:564 -msgid "The http server sent an invalid Content-Range header" +#: methods/http.cc:568 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:566 -msgid "This http server has broken range support" +#: methods/http.cc:570 +#, fuzzy +msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:590 +#: methods/http.cc:594 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:733 +#: methods/http.cc:741 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:738 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:761 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:789 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:814 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:828 -msgid "Error reading from server Remote end closed connection" +#: methods/http.cc:836 +#, fuzzy +msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:830 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1061 -msgid "Bad header Data" +#: methods/http.cc:1069 +#, fuzzy +msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1078 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1169 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Gwall mewnol" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" @@ -1954,8 +2028,8 @@ msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME #: apt-pkg/contrib/configuration.cc:586 -#, c-format -msgid "Syntax error %s:%u: Malformed Tag" +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" #: apt-pkg/contrib/configuration.cc:603 @@ -1966,7 +2040,8 @@ msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" #: apt-pkg/contrib/configuration.cc:643 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" +msgstr "" +"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" #: apt-pkg/contrib/configuration.cc:650 #, c-format @@ -2051,7 +2126,7 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -2080,56 +2155,52 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:358 -#, c-format -msgid "Waited, for %s but it wasn't there" +#: apt-pkg/contrib/fileutl.cc:359 +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:368 +#: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:371 +#: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:373 +#: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:417 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:473 +#: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" -#: apt-pkg/contrib/fileutl.cc:491 -msgid "Write error" -msgstr "Gwall ysgrifennu" - # FIXME -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:578 +#: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:584 +#: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2147,8 +2218,8 @@ msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" #: apt-pkg/pkgcache.cc:147 @@ -2204,15 +2275,18 @@ msgid "extra" msgstr "ychwanegol" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +#, fuzzy +msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +#, fuzzy +msgid "Candidate versions" msgstr "Fersiynau Posib" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +#, fuzzy +msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? @@ -2242,14 +2316,15 @@ msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" #: apt-pkg/sourcelist.cc:98 -#, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2267,10 +2342,15 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" #: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known in on line %u in source list %s" +#, fuzzy, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" +#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#, fuzzy, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + # FIXME: %s may have an arbirrary length #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2280,33 +2360,34 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " -"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych " -"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." +"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " +"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:238 +#: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei " -"gyfer." +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " +"ei gyfer." -#: apt-pkg/algorithms.cc:1056 +#: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod " -"wedi ei achosi gan pecynnau wedi eu dal." +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " +"ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1058 +#: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." +msgstr "" +"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." #: apt-pkg/acquire.cc:61 #, c-format @@ -2334,7 +2415,8 @@ msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" #: apt-pkg/init.cc:135 -msgid "Unable to determine a suitable system type" +#, fuzzy +msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" #: apt-pkg/clean.cc:61 @@ -2375,44 +2457,44 @@ msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occured while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occured while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occured while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occured while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occured while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occured while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occured while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei " -" drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." @@ -2420,16 +2502,17 @@ msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occured while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2455,12 +2538,12 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" # FIXME: case -#: apt-pkg/acquire-item.cc:654 +#: 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 " @@ -2469,7 +2552,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:689 +#: 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 " @@ -2478,14 +2561,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:720 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:807 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2494,10 +2577,104 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "Ni Chanfuwyd Y Ffeil" +#: apt-pkg/cdrom.cc:504 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 +msgid "Identifying.. " +msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +#: apt-pkg/cdrom.cc:538 +#, c-format +msgid "Stored label: %s \n" +msgstr "" + +#: apt-pkg/cdrom.cc:558 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:576 +msgid "Unmounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:580 +#, fuzzy +msgid "Waiting for disc...\n" +msgstr "Yn aros am benawdau" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:588 +msgid "Mounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:606 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:644 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:701 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:717 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:721 +#, fuzzy +msgid "Copying package lists..." +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-pkg/cdrom.cc:745 +#, fuzzy +msgid "Writing new source list\n" +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." + +#: apt-pkg/cdrom.cc:754 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/cdrom.cc:788 +msgid "Unmounting CD-ROM..." +msgstr "" + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#~ msgid "Abort? [Y/n] " +#~ msgstr "Erthylu? [I/n] " + +#~ msgid "Write Error" +#~ msgstr "Gwall Ysgrifennu" + +#~ msgid "File Not Found" +#~ msgstr "Ni Chanfuwyd Y Ffeil" diff --git a/po/da.po b/po/da.po index 7d8f3508f..44cf0337a 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -153,7 +153,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 for %s %s oversat p %s %s\n" @@ -623,7 +623,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: 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 "Fejl ved tolkning af regulrt udtryk - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (grundet %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" @@ -772,11 +773,11 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: 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 "Kunne ikke lse nedhentningsmappen" -#: 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 "Listen med kilder kunne ikke lses." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/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 "Kunne ikke hente %s %s\n" @@ -842,7 +843,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: 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 "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -945,7 +946,7 @@ msgstr "Valgte version %s (%s) af %s\n" msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" @@ -961,21 +962,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: 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 "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%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 "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: 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)." @@ -983,7 +984,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: 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" @@ -994,7 +995,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: 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" @@ -1003,105 +1004,105 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: 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 "Mislykkedes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\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 " @@ -1109,7 +1110,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: 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 " @@ -1118,32 +1119,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: 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 "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Understttede moduler:" -#: 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" @@ -1396,8 +1397,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opstningsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1544,7 +1545,7 @@ msgstr "Intern fejl under tilf #: apt-inst/deb/dpkgdb.cc:383 #, fuzzy -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -1752,7 +1753,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: 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 "Problem ved \"hashing\" af fil" @@ -1880,43 +1881,43 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern fejl" @@ -2373,37 +2374,37 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 #, fuzzy, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, fuzzy, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, fuzzy, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, fuzzy, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, fuzzy, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2422,12 +2423,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, fuzzy, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, fuzzy, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/de.po b/po/de.po index 3cb0cc23e..e053fee1e 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 für %s %s kompiliert am %s %s\n" @@ -376,20 +376,27 @@ 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, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" @@ -624,7 +631,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: 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 "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -693,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" @@ -775,11 +783,11 @@ msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: 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 "Kann kein Lock für das Downloadverzeichnis erhalten." -#: 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 "Die Liste der Quellen konnte nicht gelesen werden." @@ -818,9 +826,9 @@ msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -836,7 +844,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/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 "Konnte %s nicht holen %s\n" @@ -845,7 +853,7 @@ msgstr "Konnte %s nicht holen %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: 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 "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -949,7 +957,7 @@ msgstr "Gewählte Version %s (%s) für %s\n" msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" @@ -965,23 +973,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: 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 "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -989,7 +997,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: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" @@ -1001,7 +1009,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: 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" @@ -1012,110 +1020,110 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: 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 "Fehlgeschlagen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\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 " @@ -1124,7 +1132,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: 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 " @@ -1133,32 +1141,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: 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" @@ -1415,8 +1423,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1775,7 +1783,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: 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 "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1903,45 +1911,45 @@ msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interner Fehler" @@ -2488,11 +2496,11 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %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 "MD5-Summe stimmt nicht" -#: 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 " @@ -2501,7 +2509,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: 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 " @@ -2510,14 +2518,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: 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 "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Größe stimmt nicht" diff --git a/po/el.po b/po/el.po index f331c279d..4a0cfe84d 100644 --- a/po/el.po +++ b/po/el.po @@ -16,14 +16,15 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-20 15:01EEST\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"org>\n" "X-Generator: KBabel 1.9.1\n" #: cmdline/apt-cache.cc:135 @@ -160,7 +161,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 για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -336,7 +337,6 @@ msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -395,8 +395,7 @@ msgstr "" "για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n" "(Τομέας).\n" "\n" -"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από " -"μια\n" +"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n" "ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n" "για παράκαμψη των αρχείων πηγών src.\n" "\n" @@ -638,7 +637,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: 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 "σφάλμα μεταγλωτισμου - %s" @@ -707,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" @@ -790,11 +790,11 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: 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 "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: 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 "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -833,9 +833,9 @@ msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -851,7 +851,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: 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 "Αποτυχία ανάκτησης του %s %s\n" @@ -860,7 +860,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: 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 "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -966,7 +966,7 @@ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" @@ -982,21 +982,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: 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 "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%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 "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: 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)." @@ -1004,7 +1004,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: 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" @@ -1016,7 +1016,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: 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" @@ -1026,108 +1026,108 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: 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 "Απέτυχε" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: 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 "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\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 " @@ -1135,7 +1135,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: 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 " @@ -1144,32 +1144,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: 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 "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: 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" @@ -1422,8 +1422,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής στο αρχείο %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1569,6 +1569,7 @@ msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα" @@ -1776,7 +1777,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 "Πρόβλημα κατά το hashing του αρχείου" @@ -1903,44 +1904,44 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω 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 "Εσωτερικό Σφάλμα" @@ -2404,37 +2405,37 @@ msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" @@ -2454,12 +2455,12 @@ msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" @@ -2486,11 +2487,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %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" -#: 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 " @@ -2499,7 +2500,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: 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 " @@ -2508,7 +2509,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: 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." @@ -2516,7 +2517,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" diff --git a/po/en_GB.po b/po/en_GB.po index e374f13d2..574a296d3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -147,7 +147,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: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 "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "" -#: 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 "" @@ -632,7 +632,7 @@ msgstr "" #: cmdline/apt-get.cc:544 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 "" @@ -709,11 +709,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "" -#: 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 "" @@ -752,9 +752,9 @@ msgid "Yes, do as I say!" msgstr "" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -770,7 +770,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: 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 "" @@ -779,7 +779,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: 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 "" @@ -875,7 +875,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -889,21 +889,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%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 "You might want to run ‘apt-get -f install’ to correct these:" -#: 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)." @@ -911,7 +911,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: 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" @@ -919,149 +919,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: 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" @@ -1261,9 +1261,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Could not resolve ‘%s’" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1611,7 +1611,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 "" @@ -1738,43 +1738,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 "" @@ -2301,31 +2301,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/es.po b/po/es.po index 297aa64a3..e046e15c2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubn Porras Campo \n" "Language-Team: Spanish \n" @@ -151,7 +151,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 en %s %s\n" @@ -631,7 +631,7 @@ msgstr "Fall 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 "Error de compilacin de expresiones regulares - %s" @@ -700,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (por %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Se van a eliminar los siguientes paquetes esenciales\n" @@ -780,11 +781,11 @@ msgstr "Hay problemas y se utiliz msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: 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 "No se puede bloquear el directorio de descarga" -#: 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 "No se pudieron leer las listas de fuentes." @@ -824,9 +825,9 @@ msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -842,7 +843,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea 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 "Imposible obtener %s %s\n" @@ -851,7 +852,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: 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 "Descarga completa y en modo de slo descarga" @@ -952,7 +953,7 @@ msgstr "Versi msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: 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 "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin 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 "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: 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)." @@ -990,7 +991,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: 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" @@ -1002,7 +1003,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de 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" @@ -1012,107 +1013,107 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: 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 "Fall" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: 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 "No se pudo encontrar un paquete de fuentes 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 "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\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 " @@ -1121,7 +1122,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: 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 " @@ -1130,32 +1131,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: 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 "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: 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" @@ -1412,8 +1413,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuracin duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Fall el cierre del archivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: 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 "Hay problemas enlazando fichero" @@ -1894,43 +1895,43 @@ msgstr " msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error interno" @@ -2479,11 +2480,11 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %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 "La suma MD5 difiere" -#: 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 " @@ -2493,7 +2494,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: 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." @@ -2510,7 +2511,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "El tamao difiere" diff --git a/po/eu.po b/po/eu.po index fec23bfe5..590e916f8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-04-20 20:05+0200\n" "Last-Translator: Hizkuntza Politikarako Sailburuordetza \n" "Language-Team: Basque \n" @@ -152,7 +152,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 (%s %s) konpilatua: %s %s\n" @@ -620,7 +620,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: 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 "Adierazpen erregularren konpilazio-errorea - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" @@ -769,11 +770,11 @@ msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: 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 "Ezin da deskarga-direktorioa blokeatu" -#: 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 "Ezin izan da iturburu-zerrenda irakurri." @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -830,7 +831,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: 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 "Ezin da lortu %s %s\n" @@ -839,7 +840,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: 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 "Deskarga amaituta eta deskarga soileko moduan" @@ -940,7 +941,7 @@ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" @@ -956,21 +957,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: 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 "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\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 "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: 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)." @@ -978,7 +979,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: 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" @@ -990,7 +991,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: 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" @@ -999,107 +1000,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: 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 "Huts egin du" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: 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 "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\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 " @@ -1107,7 +1108,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: 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 " @@ -1116,32 +1117,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: 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" @@ -1391,8 +1392,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1749,7 +1750,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: 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 "Arazoa fitxategiaren hash egitean" @@ -1877,43 +1878,43 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Barne-errorea" diff --git a/po/fi.po b/po/fi.po index 3436485a9..04cc6473c 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 laitealustalle %s %s käännöksen päiväys %s %s\n" @@ -623,7 +623,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: 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 "Käännösvirhe lausekkeessa - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (syynä %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" @@ -772,11 +773,11 @@ msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" 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: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 "Noutokansiota ei saatu lukittua" -#: 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 "Lähteiden luetteloa ei pystynyt lukemaan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: 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 "Tiedoston %s nouto ei onnistunut %s\n" @@ -843,7 +844,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: 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 "Nouto on valmis ja määrätty vain nouto" @@ -944,7 +945,7 @@ msgstr "Valittiin versio %s (%s) paketille %s\n" msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: 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 "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%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 "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: 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)." @@ -982,7 +983,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: 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" @@ -993,7 +994,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: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" @@ -1003,106 +1004,106 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: 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 "Ei onnistunut" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\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 " @@ -1110,7 +1111,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: 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 " @@ -1119,32 +1120,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: 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 "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: 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" @@ -1394,8 +1395,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1748,7 +1749,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: 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 "Pulmia tiedoston hajautuksessa" @@ -1875,43 +1876,43 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2445,11 +2446,11 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %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 ei täsmää" -#: 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 " @@ -2458,7 +2459,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: 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 " @@ -2467,7 +2468,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: 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." @@ -2475,7 +2476,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Koko ei täsmää" diff --git a/po/fr.po b/po/fr.po index d317a2a80..26323dd75 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgid "" 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-05-26 00:44+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-28 20:52+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -151,7 +151,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 pour %s %s est compil le %s %s\n" @@ -301,8 +301,7 @@ 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" @@ -418,8 +417,7 @@ 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 @@ -629,7 +627,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: 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 "Erreur de compilation de l'expression rationnelle - %s" @@ -699,12 +697,12 @@ msgstr "%s (en raison de %s) " #: cmdline/apt-get.cc:544 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 "" -"DANGER: Les paquets essentiels suivants vont tre enlevs\n" -"Vous NE devez PAS faire ceci, moins de savoir exactement ce que vous tes\n" -"en train de faire!" +"ATTENTION: Les paquets essentiels suivants vont tre enlevs.\n" +"Vous NE devez PAS faire ceci, moins de savoir exactement ce\n" +"que vous tes en train de faire." #: cmdline/apt-get.cc:575 #, c-format @@ -777,14 +775,13 @@ 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 enlevs mais la dsinstallation est dsactive." +msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: 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 "Impossible de verrouiller le rpertoire de tlchargement" -#: 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 "La liste des sources ne peut tre lue." @@ -802,8 +799,7 @@ msgstr "Il est n #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" -"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" #: cmdline/apt-get.cc:829 #, c-format @@ -830,7 +826,7 @@ msgstr "Oui, faites ce que je vous dis !" #: cmdline/apt-get.cc:865 #, 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 "" @@ -846,7 +842,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/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 "Impossible de rcuprer %s %s\n" @@ -855,7 +851,7 @@ msgstr "Impossible de r msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: 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 "Tlchargement achev et dans le mode tlchargement uniquement" @@ -869,8 +865,7 @@ 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." @@ -932,8 +927,7 @@ 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 rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -959,7 +953,7 @@ msgstr "Version choisie %s (%s) pour %s\n" msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" @@ -975,22 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" -#: 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 "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, slectionne %s pour l'expression rationnelle %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 "" -"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" -#: 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)." @@ -998,7 +991,7 @@ msgstr "" "Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n" "(ou indiquez une solution)." -#: 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" @@ -1010,7 +1003,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "t crs ou ne sont pas sortis d'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" @@ -1019,107 +1012,107 @@ msgstr "" "Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider rsoudre la situation: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: 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 "chec" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: 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 "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\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 " @@ -1128,7 +1121,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: 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 " @@ -1137,33 +1130,32 @@ msgstr "" "La dpendance %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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Modules reconnus:" -#: 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" @@ -1336,8 +1328,7 @@ 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 "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1420,7 +1411,7 @@ msgstr "Fichier de configuration en double %s/%s" #: 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 "Erreur d'criture du fichier %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1568,7 +1559,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Le cache des paquets doit tre initialis en premier" #: apt-inst/deb/dpkgdb.cc:386 @@ -1598,8 +1589,7 @@ 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 @@ -1697,8 +1687,7 @@ 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 rpondu: %s" +msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1735,8 +1724,7 @@ 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 donnes, dlai de connexion dpass" +msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1780,7 +1768,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: 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 "Problme de hachage du fichier" @@ -1909,43 +1897,43 @@ msgstr "Ce serveur http poss msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erreur interne" @@ -2270,14 +2258,12 @@ 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 forme dans la liste des sources %s (distribution absolue)" +msgstr "Ligne %lu mal forme 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 forme dans la liste des sources %s (analyse de distribution)" +msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2297,14 +2283,12 @@ 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 forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2325,8 +2309,7 @@ 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 rinstall, mais je ne parviens pas trouver son " "archive." @@ -2381,8 +2364,7 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "Vous devez insrer 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." @@ -2415,37 +2397,37 @@ msgstr "Le cache poss #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2456,8 +2438,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Vous avez dpass le nombre de versions que cet APT est capable de traiter." +msgstr "Vous avez dpass 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." @@ -2467,12 +2448,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2493,8 +2474,7 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "" -"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format @@ -2526,8 +2506,7 @@ msgstr "" #: 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." @@ -2637,6 +2616,36 @@ msgstr "" "%i enregistrements crits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "Le cache des paquets doit tre initialis en premier" + +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" + #~ msgid "Total Package Names : " #~ msgstr "Nombre total de paquets: " @@ -2842,32 +2851,3 @@ msgstr "" #~ 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 189370945..8dae868ef 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -148,7 +148,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 בשביל %s %s קומפל על %s %s\n" @@ -523,7 +523,7 @@ msgstr "כשלון בשינוי השם %s ל-%s" msgid "Y" msgstr "Y" -#: 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 "" @@ -592,8 +592,9 @@ msgid "%s (due to %s) " msgstr "%s (בגלל %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" @@ -638,8 +639,7 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" -msgstr "" -"א ז ה ר ה: החבילות החיוניות הבאות יוסרו" +msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" #: cmdline/apt-get.cc:658 msgid " Done" @@ -674,11 +674,11 @@ msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא הא msgid "Packages need to be removed but remove is disabled." msgstr "" -#: 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 "לא מצליח לנעול את ספרית ההורדה." -#: 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 "רשימת המקורות לא ניתנת לקריאה." @@ -719,7 +719,7 @@ msgstr "כן, עשה כפי שאני אומר!" #: cmdline/apt-get.cc:865 #, 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 "" @@ -733,7 +733,7 @@ msgstr "בטל." msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/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 "כשלון בהבאת %s %s\n" @@ -742,7 +742,7 @@ msgstr "כשלון בהבאת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: 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 "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -838,7 +838,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -852,27 +852,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: 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)." msgstr "" -#: 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" @@ -880,149 +880,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: 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" @@ -1219,9 +1219,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "כשלון בפענוח %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1566,7 +1566,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 "" @@ -1693,43 +1693,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 "" @@ -2256,31 +2256,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: 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 "" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -#: 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 " "manually fix this package." msgstr "" -#: 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 "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/hu.po b/po/hu.po index cdc21fce3..5dbebd086 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -151,7 +151,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 ehhez: %s %s fordítás ideje: %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" msgid "Y" msgstr "I" -#: 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 "Regex fordítási hiba - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (%s miatt) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" @@ -773,11 +774,11 @@ msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" 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: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 "Nem tudom zárolni a letöltési könyvtárat" -#: 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 források listája olvashatatlan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/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 "Nem sikerült letölteni a következőt: %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nem sikerült letölteni a következőt: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: 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 "A letöltés befejeződött a 'csak letöltés' módban" @@ -944,7 +945,7 @@ msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: 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 "Nem található a(z) %s csomag" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" -#: 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)." @@ -983,7 +984,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: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" @@ -995,7 +996,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: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" @@ -1005,108 +1006,108 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A következő információ talán segít megoldani a helyzetet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "A következő extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: 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 "Sikertelen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, 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:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1116,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1125,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: 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" @@ -1397,8 +1398,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nem sikerült a(z) %s fájlba írni" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1755,7 +1756,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: 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 "Probléma a fájl hash értékének meghatározásakor" @@ -1882,43 +1883,43 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat " msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Belső hiba" @@ -2461,11 +2462,11 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %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 "Az MD5Sum nem megfelelő" -#: 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 " @@ -2474,7 +2475,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: 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 " @@ -2483,14 +2484,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." -#: 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 "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "A méret nem megfelelő" diff --git a/po/it.po b/po/it.po index 602e441ab..edb215bbc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -147,7 +147,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 per %s %s compilato il %s %s\n" @@ -623,7 +623,7 @@ msgstr "Impossibile rinominare %s in %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 "Errore di compilazione della regex - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (a causa di %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n" @@ -774,11 +775,11 @@ msgstr "Sussistono dei problemi e -y msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: 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 "Impossibile creare un lock sulla directory di 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 "La lista dei sorgenti non pu essere letta." @@ -819,9 +820,9 @@ msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -837,7 +838,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [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 "Impossibile ottenere %s %s\n" @@ -846,7 +847,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: 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 completato e in modalit download-only" @@ -949,7 +950,7 @@ msgstr "Versione selezionata %s (%s) per %s\n" msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" @@ -965,22 +966,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: 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 "Impossibile trovare %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -988,7 +989,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: 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" @@ -1000,7 +1001,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: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" @@ -1010,107 +1011,107 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: 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 "Fallito" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" -#: 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 "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficente" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\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 " @@ -1119,7 +1120,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: 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 " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduli supportati:" -#: 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" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplice %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Scrittura del file %s fallita" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: 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 "Problemi nella creazione dell'hash del file" @@ -1895,44 +1896,44 @@ msgstr "Questo server HTTP ha il supporto del range bacato" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Errore interno" @@ -2479,11 +2480,11 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente" msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %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 "Somma MD5 non corrispondente" -#: 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 " @@ -2493,7 +2494,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: 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." @@ -2510,7 +2511,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" diff --git a/po/ja.po b/po/ja.po index fa9829bb2..acd03c6cc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 12:54+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: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 for %s %s ѥ: %s %s\n" @@ -622,7 +622,7 @@ msgstr "%s msgid "Y" msgstr "Y" -#: 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 "ɽŸ顼 - %s" @@ -691,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (%s Τ) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ٹ: ʲԲķѥåޤ\n" @@ -773,11 +774,11 @@ msgstr " msgid "Packages need to be removed but remove is disabled." msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ" -#: 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 "ɥǥ쥯ȥåǤޤ" -#: 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 "ΥꥹȤɤळȤǤޤ" @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "³Ԥޤ [Y/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 "%s μ˼Ԥޤ %s\n" @@ -843,7 +844,7 @@ msgstr "%s msgid "Some files failed to download" msgstr "ĤΥեμ˼Ԥޤ" -#: 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 "ɥ꡼⡼ɤǥѥåΥɤλޤ" @@ -946,7 +947,7 @@ msgstr "%3$s msgid "The update command takes no arguments" msgstr "update ޥɤϰޤ" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "list ǥ쥯ȥå뤳ȤǤޤ" @@ -962,23 +963,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "顼AllUpgrade ˲ޤ" -#: 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 "ѥå %s դޤ" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr ": ɽ '%2$s' Ф %1$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 "" "ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷" "ޤ:" -#: 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)." @@ -986,7 +987,7 @@ msgstr "" "̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ" "Ƥ)" -#: 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" @@ -998,7 +999,7 @@ msgstr "" "Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n" "ƤΤȹͤޤ" -#: 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" @@ -1008,107 +1009,107 @@ msgstr "" "ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n" "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "줿ѥå" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "ƥѥå:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "侩ѥå:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "åץ졼ɥѥå򸡽ФƤޤ... " -#: 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 "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "λ" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ" -#: 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 "%s ΥѥåĤޤ" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ˽ʬʶڡޤ" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB %1$sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr " %s \n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "ĤΥ֤μ˼Ԥޤ" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "ӥɥޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "ҥץԤޤ" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s build-dependency 뤳ȤǤޤ" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s ˤ build depends ꤵƤޤ\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 " @@ -1117,7 +1118,7 @@ msgstr "" "ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط" "Ǥޤ" -#: 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 " @@ -1126,32 +1127,32 @@ msgstr "" "ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s " " %1$s ΰ¸طȤǤޤ" -#: 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 "" "%2$s ΰ¸ط %1$s ȤǤޤ: 󥹥ȡ뤵줿 %3$s ѥ" "Ͽޤ" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s Build-dependency ȤǤޤǤ" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "build dependency ν˼Ԥޤ" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "ݡȤƤ⥸塼:" -#: 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" @@ -1402,8 +1403,8 @@ msgid "Duplicate conf file %s/%s" msgstr "ե %s/%s ʣƤޤ" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s ν񤭹ߤ˼Ԥޤ" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1758,7 +1759,7 @@ msgstr " msgid "Unable to accept connection" msgstr "³ accept Ǥޤ" -#: 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 "եΥϥåǤ" @@ -1885,43 +1886,43 @@ msgstr "http msgid "Unknown date format" msgstr "եեޥåȤǤ" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select ˼Ԥޤ" -#: 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 "顼" @@ -2461,11 +2462,11 @@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "͡˼Ԥޤ%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 Ŭ礷ޤ" -#: 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 " @@ -2474,7 +2475,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ (¸ߤʤƥΤ)" -#: 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 " @@ -2483,7 +2484,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ" -#: 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." @@ -2491,7 +2492,7 @@ msgstr "" "ѥåǥåե뤬Ƥޤѥå %s Filename: " "եɤޤ" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ŭ礷ޤ" diff --git a/po/ko.po b/po/ko.po index 50999a8da..ebb80cb0d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -145,7 +145,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 (%s %s), 컴파일 시각 %s %s\n" @@ -619,7 +619,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: 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 "정규식 컴파일 오류 - %s" @@ -688,8 +688,9 @@ msgid "%s (due to %s) " msgstr "%s (%s때문에) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n" @@ -769,11 +770,11 @@ msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: 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 "내려받기 디렉토리를 잠글 수 없습니다" -#: 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 "소스 목록을 읽을 수 없습니다." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/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 "%s 파일을 받는 데 실패했습니다 %s\n" @@ -842,7 +843,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: 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 "내려받기를 마쳤고 내려받기 전용 모드입니다" @@ -944,7 +945,7 @@ msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: 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 "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$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 "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: 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)." @@ -983,7 +984,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: 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" @@ -994,7 +995,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 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" @@ -1003,105 +1004,105 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: 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 "실패" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: 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 "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\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 " @@ -1110,7 +1111,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: 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 " @@ -1119,32 +1120,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: 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 "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: 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" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1746,7 +1747,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 "파일 해싱에 문제가 있습니다" @@ -1873,43 +1874,43 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select가 실패했습니다" -#: 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 "내부 오류" @@ -2442,11 +2443,11 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %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이 맞지 않습니다" -#: 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 " @@ -2455,7 +2456,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: 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 " @@ -2464,14 +2465,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: 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 "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" diff --git a/po/nb.po b/po/nb.po index ff8fce4a2..ad66a1e9f 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokml \n" @@ -162,7 +162,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 for %s %s kompilert p %s %s\n" @@ -637,7 +637,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: 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 "Kompileringsfeil i regulrt uttrykk - %s" @@ -706,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (pga. %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ADVARSEL: Flgende kjernepakker vil bli fjernet\n" @@ -786,11 +787,11 @@ msgstr "Det oppsto problemer og msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: 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 "Klarer ikke lse nedlastingsmappa" -#: 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 "Kan ikke lese kildlista." @@ -830,9 +831,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -848,7 +849,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/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 "Klarte ikke skaffe %s %s\n" @@ -857,7 +858,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: 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 "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -959,7 +960,7 @@ msgstr "Utvalgt versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" @@ -975,21 +976,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: 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 "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %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 "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: 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)." @@ -997,7 +998,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: 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" @@ -1009,7 +1010,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: 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" @@ -1019,112 +1020,112 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: 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 "Mislyktes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\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 " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: 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 " @@ -1133,32 +1134,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Stttede moduler:" -#: 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" @@ -1409,8 +1410,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: 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 "Problem ved oppretting av nkkel for fil" @@ -1894,43 +1895,43 @@ msgstr "Denne HTTP-tjeneren har msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2465,11 +2466,11 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %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 "Feil MD5sum" -#: 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 " @@ -2478,7 +2479,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: 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 " @@ -2487,13 +2488,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: 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 "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil strrelse" diff --git a/po/nl.po b/po/nl.po index f0b90d9bf..48a2801f4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 voor %s %s gecompileerd op %s %s\n" @@ -627,7 +627,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: 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 "Regex-compilatiefout - %s" @@ -696,8 +696,9 @@ msgid "%s (due to %s) " msgstr "%s (wegens %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n" @@ -777,11 +778,11 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: 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 "Kon de ophaalmap niet vergrendelen" -#: 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 "De lijst van bronnen kon niet gelezen worden." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -838,7 +839,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/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 "Ophalen van %s %s is mislukt\n" @@ -847,7 +848,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: 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 "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -951,7 +952,7 @@ msgstr "Versie %s (%s) geselecteerd voor %s\n" msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" @@ -967,23 +968,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: 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 "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -991,7 +992,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: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" @@ -1002,7 +1003,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: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" @@ -1012,109 +1013,109 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: 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 "Mislukt" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\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 " @@ -1123,7 +1124,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: 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 " @@ -1132,32 +1133,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:2243 +#: cmdline/apt-get.cc:2252 #, 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: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: 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" @@ -1417,8 +1418,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1775,7 +1776,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: 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 "Probleem bij het hashen van het bestand" @@ -1904,44 +1905,44 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interne fout" @@ -2489,11 +2490,11 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %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 komt niet overeen" -#: 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 " @@ -2502,7 +2503,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: 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 " @@ -2511,7 +2512,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: 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." @@ -2519,7 +2520,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Grootte komt niet overeen" diff --git a/po/nn.po b/po/nn.po index 4284ac7cd..6bd23e0f9 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -151,7 +151,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 for %s %s kompilert p %s %s\n" @@ -621,7 +621,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: 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 "Regex-kompileringsfeil - %s" @@ -690,8 +690,9 @@ msgid "%s (due to %s) " msgstr "%s (fordi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" @@ -771,11 +772,11 @@ msgstr "Det oppstod problem, og msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: 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 "Klarte ikkje lsa nedlastingskatalogen" -#: 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 "Kjeldelista kan ikkje lesast." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -833,7 +834,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/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 "Klarte ikkje henta %s %s\n" @@ -842,7 +843,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: 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 "Nedlastinga er ferdig i nedlastingsmodus" @@ -945,7 +946,7 @@ msgstr "Vald versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" @@ -961,22 +962,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: 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 "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %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 "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: 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 +985,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: 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 +997,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: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,112 +1007,112 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: 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 "Mislukkast" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\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 " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: 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 " @@ -1120,31 +1121,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Sttta modular:" -#: 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" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1750,7 +1751,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: 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 "Problem ved oppretting av nkkel for fil" @@ -1877,43 +1878,43 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2448,11 +2449,11 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %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 "Feil MD5-sum" -#: 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 " @@ -2461,7 +2462,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: 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 " @@ -2469,14 +2470,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: 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 "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil storleik" diff --git a/po/pl.po b/po/pl.po index 26a5239b7..be2659af4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -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 dla %s %s skompilowany %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: 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 "Bd kompilacji wyraenia regularnego - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (z powodu %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "UWAGA: Zostan usunite nastpujce istotne pakiety\n" @@ -773,11 +774,11 @@ msgstr "By msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: 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 "Nie udao si zablokowa katalogu pobierania" -#: 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 "Nie udao si odczyta list rde." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -834,7 +835,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/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 "Nie udao si pobra %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nie uda msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: 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 "Ukoczono pobieranie w trybie samego pobierania" @@ -946,7 +947,7 @@ msgstr "Wybrano wersj msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" @@ -962,21 +963,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: 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 "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%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 "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: 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 +985,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: 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 +997,7 @@ msgstr "" "niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodzce\")." -#: 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,110 +1007,110 @@ msgstr "" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: 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 "Nie udao si" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: 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 "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\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 " @@ -1118,7 +1119,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: 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 " @@ -1127,32 +1128,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: 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 "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: 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" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nie udao si zapisa pliku %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: 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 "Nie udao si obliczy skrtu pliku" @@ -1887,43 +1888,43 @@ msgstr "Ten serwer HTTP nieprawid msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2463,11 +2464,11 @@ msgstr "B msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %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 "Bdna suma MD5" -#: 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 " @@ -2476,7 +2477,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: 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 " @@ -2485,14 +2486,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: 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 "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Bdny rozmiar" diff --git a/po/pt.po b/po/pt.po index 4b1568efe..84bc5b49d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -148,7 +148,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" @@ -620,7 +620,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" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (devido a %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Os seguintes pacotes essenciais serão removidos\n" @@ -770,11 +771,11 @@ msgstr "Há problemas e -y foi usado sem --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: 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 directó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." @@ -814,9 +815,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -832,7 +833,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/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 obter %s %s\n" @@ -841,7 +842,7 @@ msgstr "Falha ao obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: 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" @@ -944,7 +945,7 @@ msgstr "Versão seleccionada %s (%s) para %s\n" 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 directório de listas" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: 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 encontrar o pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -982,7 +983,7 @@ msgstr "" "Dependências não satisfeitas. 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" @@ -994,7 +995,7 @@ msgstr "" "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados 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" @@ -1005,109 +1006,109 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra 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 Actualizaçã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 obtenha o código 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 de código 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 obter %sB/%sB de arquivos de código 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 de código fonte.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao obter 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 "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "O 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 especificar pelo menos um pacote para verificar as dependências de " "compilaçã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 obter informações de dependências de compilaçã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 compilaçã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 " @@ -1116,7 +1117,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 " @@ -1125,32 +1126,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 requesitos 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 a 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 compilaçã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" @@ -1404,8 +1405,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1551,8 +1552,8 @@ 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 initialize first" -msgstr "A cache de pacotes deve ser inicializada primeiro" +msgid "The pkg cache must be initialized first" +msgstr "A cache de pacotes tem de ser inicializada primeiro" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1758,7 +1759,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligaçã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 ficheiro" @@ -1885,43 +1886,43 @@ msgstr "Este servidor http possui suporte a range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligaçã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 errados" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2383,37 +2384,37 @@ msgstr "A Cache possui um sistema de versões incompatível" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +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 occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2434,12 +2435,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %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 occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2602,34 +2603,34 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#~ msgid "The pkg cache must be initialized first" -#~ msgstr "A cache de pacotes tem de ser inicializada primeiro" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "A cache de pacotes deve ser inicializada primeiro" -#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgid "Error occured while processing %s (NewPackage)" #~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgid "Error occured while processing %s (UsePackage1)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgid "Error occured while processing %s (UsePackage2)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgid "Error occured while processing %s (NewFileVer1)" #~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgid "Error occured while processing %s (NewVersion1)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgid "Error occured while processing %s (UsePackage3)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgid "Error occured while processing %s (NewVersion2)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgid "Error occured while processing %s (FindPkg)" #~ msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgid "Error occured while processing %s (CollectFileProvides)" #~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 82271928b..968259925 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n" -"POT-Creation-Date: 2005-05-23 11:34+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: Andr Lus Lopes \n" "Language-Team: Debian-BR Project \n" @@ -691,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (por causa de %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVISO: Os pacotes essenciais a seguir sero removidos\n" @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faa o que eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -1401,8 +1402,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de confgiurao duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1548,7 +1549,8 @@ 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 initialize first" +#, fuzzy +msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:386 @@ -2382,38 +2384,38 @@ msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de verses incompatvel" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occured while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occured while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occured while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occured while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occured while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occured while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occured while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2433,13 +2435,13 @@ msgstr "" "Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occured while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ro.po b/po/ro.po index 714787236..30546b718 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -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 pentru %s %s compilat pe %s %s\n" @@ -629,7 +629,7 @@ msgstr "Eşuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: 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 "Eroare de compilare regex - %s" @@ -698,8 +698,9 @@ msgid "%s (due to %s) " msgstr "%s (datorită %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n" @@ -779,11 +780,11 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: 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 "Nu pot încuia directorul de descărcare" -#: 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 "Lista surselor nu poate fi citită." @@ -823,9 +824,9 @@ msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -842,7 +843,7 @@ msgstr "Renunţare." msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi? [Y/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 "Eşuare în aducerea %s %s\n" @@ -851,7 +852,7 @@ msgstr "Eşuare în aducerea %s %s\n" msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: 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 "Descărcare completă şi în modul doar descărcare" @@ -952,7 +953,7 @@ msgstr "Versiune selectată %s (%s) pentru %s\n" msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: 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 "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru regex '%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 "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: 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)." @@ -990,7 +991,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: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" @@ -1003,7 +1004,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din 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" @@ -1013,107 +1014,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: 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 "Eşuare" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gata" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie de %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\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 " @@ -1122,7 +1123,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1131,32 +1132,32 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface cererile de versiuni" -#: 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 "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Module suportate:" -#: 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" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Eşuare în a scrie fişierul %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1768,7 +1769,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: 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 "Problemă la criptarea fişierului" @@ -1895,44 +1896,44 @@ msgstr "Acest server http are zonă de suport necorespunzătoare" msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Eroare internă" @@ -2476,11 +2477,11 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %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 "Nepotrivire MD5Sum" -#: 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 " @@ -2489,7 +2490,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet (din pricina unui arch lipsă)" -#: 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 " @@ -2498,7 +2499,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet." -#: 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." @@ -2506,7 +2507,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" diff --git a/po/ru.po b/po/ru.po index de0660f8c..5b36cc5ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 19:50+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -161,7 +161,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 для %s %s скомпилирован %s %s\n" @@ -644,7 +644,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: 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 "Ошибка компиляции регулярного выражения - %s" @@ -714,8 +714,9 @@ msgid "%s (due to %s) " msgstr "%s (вследствие %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" @@ -796,11 +797,11 @@ msgstr "Существуют проблемы, а опция -y использо msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: 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 "Невозможно заблокировать каталог для загрузки" -#: 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 "Не читается перечень источников." @@ -843,9 +844,9 @@ msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -861,7 +862,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: 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 "Не удалось загрузить %s %s\n" @@ -870,7 +871,7 @@ msgstr "Не удалось загрузить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: 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 "Указан режим \"только загрузка\", и загрузка завершена" @@ -972,7 +973,7 @@ msgstr "Выбрана версия %s (%s) для %s\n" msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" @@ -988,23 +989,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: 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 "Не могу найти пакет %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$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 "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: 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)." @@ -1012,7 +1013,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: 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" @@ -1023,7 +1024,7 @@ msgstr "" "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из 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" @@ -1033,111 +1034,111 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация возможно поможет Вам:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Настойчиво рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Рассчёт обновлений... " -#: 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 "Неудачно" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: 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 "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\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 " @@ -1146,7 +1147,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: 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 " @@ -1155,32 +1156,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: 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 "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: 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" @@ -1432,8 +1433,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Не удалось записать файл %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1789,7 +1790,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 "Проблема при хэшировании файла" @@ -1917,43 +1918,43 @@ msgstr "Этот http-сервер не поддерживает загрузк msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ошибка в select" -#: 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 "Внутренняя ошибка" @@ -2495,11 +2496,11 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %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 не совпадает" -#: 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 " @@ -2508,7 +2509,7 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен 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 " @@ -2517,13 +2518,13 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." -#: 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 "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Не совпадает размер" diff --git a/po/sk.po b/po/sk.po index c3fc16df9..dd7cb2636 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,9 +7,9 @@ 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-09 11:29+0100\n" -"Last-Translator: Peter KLFMANiK Mann \n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-01 09:34+0200\n" +"Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,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 pre %s %s skompilovaný na %s %s\n" @@ -322,7 +322,6 @@ msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -377,16 +376,16 @@ msgstr "" "\n" "apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" "Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n" -"veľkosť a MD5 súčet. Podporovaný je tiež súbor override, pomocou ktorého\n" +"veľkosť a MD5 súčet. Podporovaný je tiež súbor 'override', pomocou ktorého\n" "môžete vynútiť hodnoty polí Priority a Section.\n" "\n" "Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n" -"Sources. Voľbou --source-override môžete určiť zdrojový súbor override.\n" +"Sources. Voľbou --source-override môžete určiť zdrojový súbor 'override'.\n" "\n" "Príkazy 'packages' a 'sources' by sa mali spúšťať v koreni stromu.\n" "Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n" -"a súbor override by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" -"prefix_cesty, pridá sa do polí Filename.\n" +"a súbor 'override' by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" +"prefix_cesty, pridá sa do polí 'filename'.\n" "Skutočný príklad z archívu Debianu:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -394,7 +393,7 @@ msgstr "" "Voľby:\n" " -h Táto nápoveda\n" " --md5 Vygeneruje kontrolný MD5 súčet\n" -" -s=? Zdrojový súbor override\n" +" -s=? Zdrojový súbor 'override'\n" " -q Tichý režim\n" " -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" " --no-delink Povolí ladiaci režim\n" @@ -619,7 +618,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: 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 "Chyba pri preklade regulárneho výrazu - %s" @@ -688,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (kvôli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" @@ -768,11 +768,11 @@ msgstr "Nastali problémy a -y bolo použité bez --force-yes" 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: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 "Adresár pre sťahovanie sa nedá zamknúť" -#: 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 "Nedá sa načítať zoznam zdrojov." @@ -811,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -829,7 +829,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/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 "Zlyhalo stiahnutie %s %s\n" @@ -838,7 +838,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: 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 "Sťahovanie ukončené v režime \"iba stiahnuť\"" @@ -938,7 +938,7 @@ msgstr "Zvolená verzia %s (%s) pre %s\n" msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" @@ -954,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: 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 "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +976,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: 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" @@ -988,7 +988,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: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" @@ -998,114 +998,114 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: 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 "Chyba" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\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 " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: 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 " @@ -1114,31 +1114,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: 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" @@ -1387,8 +1387,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Zápis do súboru %s zlyhal" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1534,8 +1534,9 @@ msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" -msgstr "Vyrovnávacia pamäť balíkov sa najprv musí inicializovať" +msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1741,7 +1742,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: 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 "Problém s hashovaním súboru" @@ -1868,43 +1869,43 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2358,39 +2359,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Pri spracovaní %s sa objavila chyba (NewPackage)" +msgstr "Chyba pri spracovaní %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage1)" +msgstr "Chyba pri spracovaní %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage2)" +msgstr "Chyba pri spracovaní %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewFileVer1)" +msgstr "Chyba pri spracovaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion1)" +msgstr "Chyba pri spracovaní %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage3)" +msgstr "Chyba pri spracovaní %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion2)" +msgstr "Chyba pri spracovaní %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2407,14 +2408,14 @@ msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Pri spracovaní %s sa objavila chyba (CollectFileProvides)" +msgstr "Chyba pri spracovaní %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2439,11 +2440,11 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %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 "Nezhoda MD5 súčtov" -#: 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 " @@ -2452,7 +2453,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: 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 " @@ -2461,13 +2462,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: 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 "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" diff --git a/po/sl.po b/po/sl.po index 2147c6f53..ad8aea470 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 za %s %s preveden na %s %s\n" @@ -616,7 +616,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: 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 "Napaka pri prevajanju regex - %s" @@ -685,8 +685,9 @@ msgid "%s (due to %s) " msgstr "%s (zaradi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" @@ -765,11 +766,11 @@ msgstr "Pri msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: 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 "Ni mogoe zakleniti imenika za prenose" -#: 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 "Seznama virov ni mogoe brati." @@ -808,9 +809,9 @@ msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -826,7 +827,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/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 "Ni mogoe dobiti %s %s\n" @@ -835,7 +836,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: 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 "Prenos dokonan in uporabljen nain samo prenos" @@ -936,7 +937,7 @@ msgstr "Izbrana razli msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" @@ -952,21 +953,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: 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 "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%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 "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: 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)." @@ -974,7 +975,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: 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" @@ -985,7 +986,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: 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" @@ -995,115 +996,115 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: 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 "Spodletelo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\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 " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: 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 " @@ -1112,31 +1113,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: 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 "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podprti moduli:" -#: 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" @@ -1387,8 +1388,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1740,7 +1741,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: 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 "Teava pri razprevanju datoteke" @@ -1867,43 +1868,43 @@ msgstr "Ta stre msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Notranja napaka" @@ -2437,11 +2438,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %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 "Neujemanje vsote MD5" -#: 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 " @@ -2450,7 +2451,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: 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 " @@ -2459,7 +2460,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: 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." @@ -2467,7 +2468,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Neujemanje velikosti" diff --git a/po/sv.po b/po/sv.po index 17827b7cc..367f6680e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-01-15 15:30+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" @@ -150,7 +150,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 fr %s %s kompilerad den %s %s\n" @@ -628,7 +628,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: 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 "Fel vid tolkning av reguljrt uttryck - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (p grund av %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "VARNING: Fljande systemkritiska paket kommer att tas bort\n" @@ -777,11 +778,11 @@ msgstr "Problem har uppst msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: 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 "Kunde inte lsa hmtningskatalogen." -#: 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 "Listan ver kllor kunde inte lsas." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -839,7 +840,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/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 "Misslyckades att hmta %s %s\n" @@ -848,7 +849,7 @@ msgstr "Misslyckades att h msgid "Some files failed to download" msgstr "Misslyckades att hmta vissa filer" -#: 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 "Hmtningen frdig i \"endast-hmta\"-lge" @@ -950,7 +951,7 @@ msgstr "Vald version %s (%s) f msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" @@ -966,21 +967,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: 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 "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr regex \"%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 "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":" -#: 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)." @@ -988,7 +989,7 @@ msgstr "" "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: 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" @@ -1000,7 +1001,7 @@ msgstr "" "distributionen, att ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"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" @@ -1010,105 +1011,105 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skrivas." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: 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 "Misslyckades" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: 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 "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Misslyckades att hmta vissa arkiv." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\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 " @@ -1116,7 +1117,7 @@ msgid "" msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: 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 " @@ -1125,32 +1126,32 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s uppfyller versionskraven" -#: 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 "" "Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s " "r fr nytt" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduler som stds:" -#: 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" @@ -1406,8 +1407,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1762,7 +1763,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: 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 "Problem med att lgga filen till hashtabellen" @@ -1894,43 +1895,43 @@ msgstr "Denna http-servers st msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internt fel" @@ -2472,11 +2473,11 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %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 "MD5-kontrollsumma stmmer inte" -#: 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 " @@ -2485,7 +2486,7 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: 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 " @@ -2494,13 +2495,13 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: 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 "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Storleken stmmer inte" diff --git a/po/tl.po b/po/tl.po index f4d26b826..9fc7a93ba 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -152,7 +152,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 sa %s %s kinompile noong %s %s\n" @@ -628,7 +628,7 @@ msgstr "Sawi ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: 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 "Error sa pag-compile ng regex - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" @@ -779,11 +780,11 @@ 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: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 "Di maaldaba ang directory ng 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 "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -822,9 +823,9 @@ msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -840,7 +841,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: 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 "Sawi sa pagkuha ng %s %s\n" @@ -849,7 +850,7 @@ msgstr "Sawi sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga tipunang hindi nakuha" -#: 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 "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" @@ -951,7 +952,7 @@ msgstr "Ang napiling bersyon %s (%s) para sa %s\n" msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" @@ -967,22 +968,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: 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 "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%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 "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: 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)." @@ -990,7 +991,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: 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" @@ -1001,7 +1002,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: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" @@ -1011,106 +1012,106 @@ msgstr "" "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 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:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " -#: 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 "Sawi" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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: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 "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Sawi sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Sawi ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay sawi.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Sawi ang prosesong anak" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\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 " @@ -1119,7 +1120,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: 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 " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Sawi sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: 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" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Nadobleng tipunang conf %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Sawi sa pagsulat ng tipunang %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: 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 sa pag-hash ng tipunan" @@ -1887,43 +1888,43 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sawi ang pagpili" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error sa pagsulat ng tipunang output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error sa pagsulat sa tipunan" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa tipunan" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sawi ang koneksyon" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internal na error" @@ -2469,11 +2470,11 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay sawi, %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 "Di tugmang MD5Sum" -#: 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 " @@ -2482,7 +2483,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang 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 " @@ -2491,7 +2492,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: 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." @@ -2499,7 +2500,7 @@ msgstr "" "Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Di tugmang laki" diff --git a/po/zh_CN.po b/po/zh_CN.po index d6fa9be1d..f7c0ae1b3 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 17:34+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Chinese (simplified) \n" @@ -148,7 +148,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 for %s %s ，编译于 %s %s\n" @@ -618,7 +618,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: 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 "编译正则表达式时出错 - %s" @@ -687,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (是由于 %s) " #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "【警告】：下列的重要软件包将被卸载 \n" @@ -767,11 +768,11 @@ msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: 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 "无法对下载目录加锁" -#: 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 "无法读取安装源列表。" @@ -810,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -828,7 +829,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/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 "无法下载 %s %s\n" @@ -837,7 +838,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: 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 "下载完毕，目前是“仅下载”模式" @@ -938,7 +939,7 @@ msgstr "选定了版本为 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 造成某些故障" -#: 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 "无法找到软件包 %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$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 "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: 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)." @@ -975,7 +976,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: 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" @@ -986,7 +987,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(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" @@ -995,112 +996,112 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对问题的解决有所帮助：" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "受损安装包" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "将会安装下列的额外的软件包：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: 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 "失败" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: 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 "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\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 " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: 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 " @@ -1109,30 +1110,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: 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 "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "被支持模块：" -#: 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" @@ -1378,8 +1379,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "无法写入文件 %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1730,7 +1731,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 "把文件加入散列表时出错" @@ -1857,43 +1858,43 @@ msgstr "该 http 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select 调用出错" -#: 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 "内部错误" @@ -2427,11 +2428,11 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%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 "MD5 校验和不符" -#: 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 " @@ -2440,7 +2441,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: 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 " @@ -2448,13 +2449,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: 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 "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "大小不符" diff --git a/po/zh_TW.po b/po/zh_TW.po index cafc2bd5f..f3b425929 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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: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 是針對於 %s %s 並編譯在 %s %s\n" @@ -620,7 +620,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: 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 "編譯正規表示法出錯 - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s（因為 %s）" #: cmdline/apt-get.cc:544 +#, fuzzy 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 "" "警告：下列的重要套件都將被刪除\n" @@ -769,11 +770,11 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: 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 "無法鎖定下載的目錄" -#: 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 "無法讀取來源單。" @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, 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 "" @@ -830,7 +831,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [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 "無法下載『%s』檔案。%s\n" @@ -839,7 +840,7 @@ msgstr "無法下載『%s』檔案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: 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 "下載完畢,目前是“僅下載”模式" @@ -940,7 +941,7 @@ msgstr "選定的版本為 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" @@ -954,21 +955,21 @@ msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: 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 "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$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 "用『apt-get -f install』指令或許能修正這些問題。" -#: 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)." @@ -976,7 +977,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: 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" @@ -987,7 +988,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 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" @@ -997,112 +998,112 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: 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 "失敗" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: 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 "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\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 " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: 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 " @@ -1111,30 +1112,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: 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 "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "支援模組:" -#: 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" @@ -1382,8 +1383,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1733,7 +1734,7 @@ msgstr "Data socket 連線逾時" 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 "問題雜湊表" @@ -1860,43 +1861,43 @@ msgstr "http 伺服器有損毀的範圍支援" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select 失敗" -#: 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 "內部錯誤" @@ -2425,31 +2426,31 @@ msgstr "無法寫入來源暫存檔。" msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%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 "MD5 檢查碼不符合。" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: 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 " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: 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 "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "檔案大小不符合。" diff --git a/test/conf_clear.cc b/test/conf_clear.cc new file mode 100644 index 000000000..259aa0f39 --- /dev/null +++ b/test/conf_clear.cc @@ -0,0 +1,23 @@ +#include +#include + +using namespace std; + +int main(int argc,const char *argv[]) +{ + Configuration Cnf; + + cout << "adding elements" << endl; + Cnf.Set("APT::Keep-Fds::",28); + Cnf.Set("APT::Keep-Fds::",17); + Cnf.Set("APT::Keep-Fds::",47); + Cnf.Dump(); + + cout << "Removing elements" << endl; + Cnf.Clear("APT::Keep-Fds",17); + Cnf.Clear("APT::Keep-Fds",28); + Cnf.Clear("APT::Keep-Fds",47); + Cnf.Dump(); + + return 0; +} diff --git a/test/makefile b/test/makefile index 9ad6233c2..a9dbdc34d 100644 --- a/test/makefile +++ b/test/makefile @@ -38,6 +38,12 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile SOURCE = testextract.cc include $(PROGRAM_H) +# Program for testing the config file parser +PROGRAM=conftest_clear +SLIBS = -lapt-pkg +SOURCE = conf_clear.cc +include $(PROGRAM_H) + # Program for testing the config file parser PROGRAM=conftest SLIBS = -lapt-pkg -- cgit v1.2.3 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 'cmdline') 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 From 7a6058744badb38d2ccac0158d6ed1359cfb0239 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2005 17:29:42 +0000 Subject: * merged with the current debian version Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-132 Completed Simplified Chinese translation * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94 * pkgDirStream has (slightly) better extract support now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95 * merge fix for #339533 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97 * some more debug output * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98 * ABI change: merged more flexible pkgAcquireFile code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99 * merged http download limit for apt (#146877) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100 * applied parts of the string speedup patch from debian #319377 (ABI change) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101 * fix for #340448 --- apt-pkg/acquire-item.cc | 15 +++++++------ apt-pkg/acquire-item.h | 5 +++-- apt-pkg/algorithms.h | 3 ++- apt-pkg/cacheiterators.h | 4 +++- apt-pkg/cdrom.cc | 3 +++ apt-pkg/deb/debsystem.cc | 7 +++++- cmdline/apt-get.cc | 1 + debian/apt.manpages | 1 + debian/rules | 1 + doc/apt-key.8.xml | 47 +++++++++++++++++++++++++++++++++++++---- doc/apt.conf.5.xml | 2 +- doc/fr/apt-config.fr.8.xml | 4 ++-- doc/fr/apt-key.fr.8.xml | 44 +++++++++++++++++++++++++++++++++----- doc/fr/apt_preferences.fr.5.xml | 4 ++-- doc/fr/makefile | 12 +++++++++-- doc/makefile | 3 ++- 16 files changed, 127 insertions(+), 29 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 09f25c0dd..88c25de43 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -142,20 +142,21 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, { Decompression = false; Erase = false; - + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); if(comprExt.empty()) { - // autoselect - if(FileExists("/usr/bin/bzip2")) - Desc.URI = URI + ".bz2"; - else - Desc.URI = URI + ".gz"; + // autoselect the compression method + if(FileExists("/usr/bin/bzip2")) + CompressionExtension = ".bz2"; + else + CompressionExtension = ".gz"; } else { - Desc.URI = URI + comprExt; + CompressionExtension = comprExt; } + Desc.URI = URI + CompressionExtension; Desc.Description = URIDesc; Desc.Owner = this; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 9e7198d8d..c34b5ef69 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -92,7 +92,8 @@ class pkgAcqIndex : public pkgAcquire::Item pkgAcquire::ItemDesc Desc; string RealURI; string ExpectedMD5; - + string CompressionExtension; + public: // Specialized action members @@ -100,7 +101,7 @@ class pkgAcqIndex : public pkgAcquire::Item virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); virtual string Custom600Headers(); - virtual string DescURI() {return RealURI + ".gz";}; + virtual string DescURI() {return RealURI + CompressionExtension;}; pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesct, string ExpectedMD5, string compressExt=""); diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 174a7f58d..b95218061 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -118,7 +118,8 @@ class pkgProblemResolver // Try to resolve problems only by using keep bool ResolveByKeep(); - + + // Install all protected packages void InstallProtect(); pkgProblemResolver(pkgDepCache *Cache); diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 7c6f43351..2b326bd65 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -222,7 +222,7 @@ class pkgCache::PrvIterator void operator ++(int) {if (Prv != Owner->ProvideP) Prv = Owner->ProvideP + (Type == PrvVer?Prv->NextPkgProv:Prv->NextProvides);}; inline void operator ++() {operator ++(0);}; - inline bool end() const {return Prv == Owner->ProvideP?true:false;}; + inline bool end() const {return Owner == 0 || Prv == Owner->ProvideP?true:false;}; // Comparison inline bool operator ==(const PrvIterator &B) const {return Prv == B.Prv;}; @@ -244,6 +244,8 @@ class pkgCache::PrvIterator inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);}; inline unsigned long Index() const {return Prv - Owner->ProvideP;}; + inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0) {}; + inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) : Prv(Trg), Type(PrvVer), Owner(&Owner) { diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index d7ef844a2..ce1beb39b 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -422,6 +422,9 @@ bool pkgCdrom::WriteSourceList(string Name,vector &List,bool Source) { F.getline(Buffer,sizeof(Buffer)); CurLine++; + if (F.fail() && !F.eof()) + return _error->Error(_("Line %u too long in source list %s."), + CurLine,File.c_str()); _strtabexpand(Buffer,sizeof(Buffer)); _strstrip(Buffer); diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 0b3a4f742..2d805ea6f 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -164,7 +164,12 @@ bool debSystem::Initialize(Configuration &Cnf) Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status"); Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg"); - + + if (StatusFile) { + delete StatusFile; + StatusFile = 0; + } + return true; } /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 356d36b48..48b21a31f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2040,6 +2040,7 @@ bool DoSource(CommandLine &CmdL) if (system(S) != 0) { fprintf(stderr,_("Unpack command '%s' failed.\n"),S); + fprintf(stderr,_("Check if the 'dpkg-dev' package is installed.\n")); _exit(1); } } diff --git a/debian/apt.manpages b/debian/apt.manpages index e621e1c49..b52ea3d3d 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -3,6 +3,7 @@ doc/apt-cdrom.8 doc/apt-config.8 doc/apt-get.8 doc/apt-key.8 +doc/apt-secure.8 doc/apt.8 doc/apt.conf.5 doc/apt_preferences.5 diff --git a/debian/rules b/debian/rules index 1e339aade..6c0a24fd9 100755 --- a/debian/rules +++ b/debian/rules @@ -274,6 +274,7 @@ apt-utils: build debian/shlibs.local cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ dh_installdocs -p$@ + dh_installexamples -p$@ # Install the man pages.. dh_installman -p$@ diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 62686618a..eac61307d 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -68,17 +68,56 @@ List trusted keys. + + + update + + + + Update the local keyring with the keyring of Debian archive + keys and removes from the keyring the archive keys which are no + longer valid. + + + + + + + + + Files + + /etc/apt/trusted.gpg + Keyring of local trusted keys, new keys will be added here. + + + /etc/apt/trustdb.gpg + Local trust database of archive keys. + + + /usr/share/keyrings/debian-archive-keyring.gpg + Keyring of Debian archive trusted keys. + + + /usr/share/keyrings/debian-archive-removed-keys.gpg + Keyring of Debian archive removed trusted keys. + + + + + - - - - +See Also + +&apt-get;, &apt-secure; + + &manbugs; &manauthor; diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 69e212243..43f33681f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,7 +284,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; sourcelist gives the location of the sourcelist and main is the default configuration file (setting has no effect, unless it is done from the config file specified by - APT_CONFIG. + APT_CONFIG). The Dir::Parts setting reads in all the config fragments in lexical order from the directory specified. After this is done then the diff --git a/doc/fr/apt-config.fr.8.xml b/doc/fr/apt-config.fr.8.xml index ac9143066..043c58686 100644 --- a/doc/fr/apt-config.fr.8.xml +++ b/doc/fr/apt-config.fr.8.xml @@ -57,7 +57,7 @@ des commandes suivantes doit Le terme shell est utilis pour accder aux informations de configuration depuis un script shell. Deux arguments doivent lui tre donns ; le -premier est une variable de shell et le second une valeur de configuration +premier est une variable du shell et le second une valeur de configuration demander. La sortie standard consiste en une liste de commandes d'assignation de shell pour chaque valeur prsente. Dans un script shell, cette commande devrait @@ -69,7 +69,7 @@ RES=`apt-config shell OPTS MyApp::Options` eval $RES -La variable d'environnement de shell $OPTS sera dfinie par la valeur de +La variable d'environnement du shell $OPTS sera dfinie par la valeur de MyApp::Options ou, par dfaut, la valeur -f. diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml index a31fb7855..29ba237e2 100644 --- a/doc/fr/apt-key.fr.8.xml +++ b/doc/fr/apt-key.fr.8.xml @@ -34,7 +34,7 @@ apt-key gre les cls dont se sert apt pour authentifier les paquets. Les paquets authentifis par ces cls seront -rputs +rputs fiables. @@ -73,13 +73,47 @@ Afficher la liste des cl + + update + + +Mettre jour le trousseau de cls local avec le trousseau de cls de l'archive +Debian et supprimer les cls qui sont primes. + + + + - - - - + Fichiers + + /etc/apt/trusted.gpg +Trousseau de cls locales fiables, les nouvelles cls sont ajoutes ici. + + + + /etc/apt/trustdb.gpg + Base de donnes locale fiable des cls de l'archive. + + + /usr/share/keyrings/debian-archive-keyring.gpg + Trousseau des cls fiables de l'archive Debian. + + + /usr/share/keyrings/debian-archive-removed-keys.gpg + + >Trousseau des cls fiables supprimes de l'archive Debian. + + + + + +Voir aussi + +&apt-get;, &apt-secure; + + &manbugs; &manauthor; diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml index c6b2c8794..6e1d2043e 100644 --- a/doc/fr/apt_preferences.fr.5.xml +++ b/doc/fr/apt_preferences.fr.5.xml @@ -7,7 +7,7 @@ ]> - + &apt-author.team; @@ -208,7 +208,7 @@ d' Package: * Pin: release a=unstable -Pin-Priority: 50 +Pin-Priority: 500 L'entre suivante affecte une priorit haute toutes les versions diff --git a/doc/fr/makefile b/doc/fr/makefile index c0e7fa7ed..596de7b09 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -5,11 +5,16 @@ SUBDIR=doc/fr # Bring in the default rules include ../../buildlib/defaults.mak +# Do not use XMLTO, build the manpages directly with XSLTPROC +XSLTPROC=/usr/bin/xsltproc +STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl + + # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ - apt-key.fr.8 + apt-key.fr.8 apt-secure.fr.8 INCLUDES = apt.ent.fr @@ -17,7 +22,7 @@ doc: $(SOURCE) $(SOURCE) :: % : %.xml $(INCLUDES) echo Creating man page $@ - $(XMLTO) man $< + $(XSLTPROC) -o $@ $(STYLESHEET) $< apt-cache.fr.8:: apt-cache.8 cp $< $@ @@ -52,4 +57,7 @@ apt-extracttemplates.fr.1:: apt-extracttemplates.1 apt-key.fr.8:: apt-key.8 cp $< $@ +apt-secure.fr.8:: apt-secure.8 + cp $< $@ + diff --git a/doc/makefile b/doc/makefile index f34b3f6e5..31ee061fb 100644 --- a/doc/makefile +++ b/doc/makefile @@ -14,7 +14,8 @@ include $(DEBIANDOC_H) # XML man pages SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ apt-config.8 apt_preferences.5 \ - apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 apt-key.8 + apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \ + apt-key.8 apt-secure.8 INCLUDES = apt.ent include $(XML_MANPAGE_H) -- cgit v1.2.3 From 9ceaa28f2ce0bde0cbf6f73a32a68761ec85f11d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 20 Feb 2006 18:50:44 +0000 Subject: * make errors during apt-get update warnings only (default sources spec) --- cmdline/apt-get.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d4a6bee32..92051f8ff 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1381,7 +1381,7 @@ bool DoUpdate(CommandLine &CmdL) return false; if (Failed == true) - return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + return _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); return true; } diff --git a/debian/changelog b/debian/changelog index 92a4671f9..3490fba7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.6.43.3) unstable; urgency=low * make apt-cache madison work without deb-src entries (#352583) * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull + * apt-get update errors are only warnings nowdays -- -- cgit v1.2.3 From 47eb38f452c7477aab782dce56e85a0a85e22764 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Feb 2006 12:23:22 +0000 Subject: * handle network failures more gracefully (default apt sources spec) apt-pkg/acquire-item.cc: - on network failures (Timeout,ResolveFailure,ConnectionRefused) move the old (known good) sigfile back and don't touch the indexfiles cmdline/apt-get.cc: - don't fail on apt-get update problems but issue a warning instead --- apt-pkg/acquire-item.cc | 10 +++++++--- cmdline/apt-get.cc | 2 +- configure.in | 2 +- debian/changelog | 23 +++++++++++++++++++++-- 4 files changed, 30 insertions(+), 7 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1fa929aad..dee00c63e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -321,8 +321,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); - // remove any partial downloaded sig-file. it may confuse proxies - // and is too small to warrant a partial download anyway + // remove any partial downloaded sig-file in partial/. + // it may confuse proxies and is too small to warrant a + // partial download anyway unlink(DestFile.c_str()); // Create the item @@ -389,17 +390,20 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); // if we get a network error we fail gracefully if(LookupTag(Message,"FailReason") == "Timeout" || LookupTag(Message,"FailReason") == "TmpResolveFailure" || LookupTag(Message,"FailReason") == "ConnectionRefused") { Item::Failed(Message,Cnf); + // move the sigfile back on network failures (and re-authenticated?) + if(FileExists(DestFile)) + Rename(DestFile,Final); return; } // Delete any existing sigfile when the acquire failed - string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); unlink(Final.c_str()); // queue a pkgAcqMetaIndex with no sigfile diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 92051f8ff..99a51c9b8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1381,7 +1381,7 @@ bool DoUpdate(CommandLine &CmdL) return false; if (Failed == true) - return _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); return true; } diff --git a/configure.in b/configure.in index 2e92bd0a9..6cd00f9de 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.43.3ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 3490fba7c..8c53d7a5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.43.3) unstable; urgency=low +apt (0.6.43.2ubuntu1) dapper; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: * ca.po: Completed to 512t. Closes: #351592 @@ -26,8 +26,9 @@ apt (0.6.43.3) unstable; urgency=low * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures - -- + -- Michael Vogt Mon, 20 Feb 2006 22:27:48 +0100 apt (0.6.43.2) unstable; urgency=low @@ -54,6 +55,24 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: -- cgit v1.2.3 From 7e5f33eb8a0f224b938f17236f684ba5cadb9c7f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Feb 2006 16:39:25 +0000 Subject: * more work for the DefaultAptSources spec apt-pkg/acquire-item.h: - add new pkgAcquire::Item::StatTransientNetworkError status apt-pkg/acquire-item.cc: - if we get a StatTransientNetworkError use old sigfile and indexfiles apt-pkg/acquire-worker.cc: - set StatTransientNetworkError on "Timeout", "TmpResolveFailure", "ConnectionRefused" cmdline/apt-get.cc: - handle a StatTransientNetworkError different than a normal error (warning instead of error) --- apt-pkg/acquire-item.cc | 10 ++-- apt-pkg/acquire-item.h | 3 +- apt-pkg/acquire-worker.cc | 7 +++ cmdline/apt-get.cc | 19 ++++-- po/apt-all.pot | 144 +++++++++++++++++++++++----------------------- 5 files changed, 102 insertions(+), 81 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index dee00c63e..da9becc44 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -75,7 +75,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Dequeue(); return; } - + Status = StatError; Dequeue(); } @@ -393,13 +393,15 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); // if we get a network error we fail gracefully - if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure" || - LookupTag(Message,"FailReason") == "ConnectionRefused") { + if(Status == StatTransientNetworkError) + { Item::Failed(Message,Cnf); // move the sigfile back on network failures (and re-authenticated?) if(FileExists(DestFile)) Rename(DestFile,Final); + + // set the status back to , Item::Failed likes to reset it + Status = pkgAcquire::Item::StatTransientNetworkError; return; } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index da1bea801..1c83f8d2e 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -48,7 +48,8 @@ class pkgAcquire::Item public: // State of the item - enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status; + enum {StatIdle, StatFetching, StatDone, StatError, + StatAuthError, StatTransientNetworkError} Status; string ErrorText; unsigned long FileSize; unsigned long PartialSize; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index d06024178..8ab67778b 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -307,6 +307,13 @@ bool pkgAcquire::Worker::RunMessages() pkgAcquire::Item *Owner = Itm->Owner; pkgAcquire::ItemDesc Desc = *Itm; OwnerQ->ItemDone(Itm); + + // set some status + if(LookupTag(Message,"FailReason") == "Timeout" || + LookupTag(Message,"FailReason") == "TmpResolveFailure" || + LookupTag(Message,"FailReason") == "ConnectionRefused") + Owner->Status = pkgAcquire::Item::StatTransientNetworkError; + Owner->Failed(Message,Config); ItemDone(); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 99a51c9b8..e98d4fec5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1355,20 +1355,29 @@ bool DoUpdate(CommandLine &CmdL) return false; bool Failed = false; + bool TransientNetworkFailure = false; for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) { if ((*I)->Status == pkgAcquire::Item::StatDone) continue; (*I)->Finished(); - + fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), (*I)->ErrorText.c_str()); + + if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) + { + TransientNetworkFailure = true; + continue; + } + Failed = true; } // Clean out any old list files - if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true) + if (!TransientNetworkFailure && + _config->FindB("APT::Get::List-Cleanup",true) == true) { if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) @@ -1380,9 +1389,11 @@ bool DoUpdate(CommandLine &CmdL) if (Cache.BuildCaches() == false) return false; - if (Failed == true) + if (TransientNetworkFailure == true) _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); - + else if (Failed == true) + return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + return true; } /*}}}*/ diff --git a/po/apt-all.pot b/po/apt-all.pot index 23de34b5c..c1edb1c79 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-01-20 14:06+0100\n" +"POT-Creation-Date: 2006-02-21 15:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -146,14 +146,14 @@ msgstr "" msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: 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:2378 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -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 "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1517 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -694,11 +694,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -761,7 +761,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:2023 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2025 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 msgid "Download complete and in download only mode" msgstr "" @@ -866,41 +866,41 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1393 cmdline/apt-get.cc:1395 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:1414 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1527 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1557 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1558 +#: cmdline/apt-get.cc:1560 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1570 +#: cmdline/apt-get.cc:1572 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 +908,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1580 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:1583 +#: cmdline/apt-get.cc:1585 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1588 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1614 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1685 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1686 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1706 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1714 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1887 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 +#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1961 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1985 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1990 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1993 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1999 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2030 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2058 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2070 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2071 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2088 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2107 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2123 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2151 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2171 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2223 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2275 #, 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:2308 +#: cmdline/apt-get.cc:2310 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2335 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2349 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2353 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2385 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2426 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1349,9 +1349,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 "" @@ -1666,34 +1666,34 @@ msgstr "" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, 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:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@ -2218,7 +2218,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:384 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2328,16 +2328,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:575 #, 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 "" @@ -2346,35 +2346,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:645 +#: apt-pkg/acquire-item.cc:646 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:758 +#: apt-pkg/acquire-item.cc:759 #, 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:817 +#: apt-pkg/acquire-item.cc:818 #, 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:853 +#: apt-pkg/acquire-item.cc:854 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:941 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From c6c31f6206dbb8900883d2547f6ff0657113a319 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Mar 2006 21:26:24 +0200 Subject: * fix the apt-key (merge problem?) --- cmdline/apt-key | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 7460a24be..be2b19a1a 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/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-archive-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi -- cgit v1.2.3 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 'cmdline') 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 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 'cmdline') 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 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 'cmdline') 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 From 54668e4e591651be2d83b95ff4a9d96668db1e36 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Jul 2006 10:58:26 +0200 Subject: * cmdline/apt-get.cc: - add a scope with a ActionGroup in DoInstall() to speed up the install of long package lists (e.g. pbuilder) --- cmdline/apt-get.cc | 261 +++++++++++++++++++++++++++-------------------------- po/apt-all.pot | 110 +++++++++++----------- 2 files changed, 187 insertions(+), 184 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 8b3c68573..ad4da133f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1476,159 +1476,162 @@ bool DoInstall(CommandLine &CmdL) 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; - } + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + // new scope for the ActionGroup { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; - while (Cache->FindPkg(S).end() == true) + pkgDepCache::ActionGroup group(Cache); + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; + // Duplicate the string + unsigned int Length = strlen(*I); + char S[300]; + if (Length >= sizeof(S)) continue; - } - - if (Length >= 1 && S[Length - 1] == '+') + strcpy(S,*I); + + // See if we are removing and special indicators.. + bool Remove = DefRemove; + char *VerTag = 0; + bool VerIsRel = false; + while (Cache->FindPkg(S).end() == true) { - Remove = false; - S[--Length] = 0; - continue; - } + // Handle an optional end tag indicating what to do + if (Length >= 1 && S[Length - 1] == '-') + { + Remove = true; + S[--Length] = 0; + continue; + } - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } + if (Length >= 1 && S[Length - 1] == '+') + { + Remove = false; + S[--Length] = 0; + continue; + } - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } + char *Slash = strchr(S,'='); + if (Slash != 0) + { + VerIsRel = false; + *Slash = 0; + VerTag = Slash + 1; + } - break; - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) - return _error->Error(_("Couldn't find package %s"),S); - - // Regexs must always be confirmed - ExpectedInst += 1000; + Slash = strchr(S,'/'); + if (Slash != 0) + { + VerIsRel = true; + *Slash = 0; + VerTag = Slash + 1; + } - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); + break; } - - // Run over the matches - bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + + // Locate the package + pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + Packages++; + if (Pkg.end() == true) { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) - continue; + // Check if the name is a regex + const char *I; + for (I = S; *I != 0; I++) + if (*I == '?' || *I == '*' || *I == '|' || + *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return _error->Error(_("Couldn't find package %s"),S); + + // Regexs must always be confirmed + ExpectedInst += 1000; + + // Compile the regex pattern + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | + REG_NOSUB)) != 0) + { + char Error[300]; + regerror(Res,&Pattern,Error,sizeof(Error)); + return _error->Error(_("Regex compilation error - %s"),Error); + } + + // Run over the matches + bool Hit = false; + for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + { + if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + continue; + + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), + Pkg.Name(),S); - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); + if (VerTag != 0) + if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + return false; + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, + ExpectedInst,false); + } + regfree(&Pattern); + + if (Hit == false) + return _error->Error(_("Couldn't find package %s"),S); + } + else + { if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } - regfree(&Pattern); - - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - } - } + } + } - /* If we are in the Broken fixing mode we do not attempt to fix the - problems. This is if the user invoked install without -f and gave - packages */ - if (BrokenFix == true && Cache->BrokenCount() != 0) - { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; - ShowBroken(c1out,Cache,false); + /* If we are in the Broken fixing mode we do not attempt to fix the + problems. This is if the user invoked install without -f and gave + packages */ + if (BrokenFix == true && Cache->BrokenCount() != 0) + { + c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + ShowBroken(c1out,Cache,false); - return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); - } + return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); + } - // Call the scored problem resolver - Fix.InstallProtect(); - if (Fix.Resolve(true) == false) - _error->Discard(); + // Call the scored problem resolver + Fix.InstallProtect(); + if (Fix.Resolve(true) == false) + _error->Discard(); - // Now we check the state of the packages, - if (Cache->BrokenCount() != 0) - { - c1out << - _("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" - "distribution that some required packages have not yet been created\n" - "or been moved out of Incoming.") << endl; - if (Packages == 1) + // Now we check the state of the packages, + if (Cache->BrokenCount() != 0) { - c1out << endl; c1out << - _("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.") << endl; - } + _("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" + "distribution that some required packages have not yet been created\n" + "or been moved out of Incoming.") << endl; + if (Packages == 1) + { + c1out << endl; + c1out << + _("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.") << endl; + } - c1out << _("The following information may help to resolve the situation:") << endl; - c1out << endl; - ShowBroken(c1out,Cache,false); - return _error->Error(_("Broken packages")); - } - + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + return _error->Error(_("Broken packages")); + } + } if (_config->FindB("APT::Get::AutomaticRemove")) { if (!DoAutomaticRemove(Cache)) return false; diff --git a/po/apt-all.pot b/po/apt-all.pot index ebf7c01cb..cc075ceb3 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-06-26 07:08+0200\n" +"POT-Creation-Date: 2006-07-26 10:56+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:2426 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2430 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1558 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1560 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -694,11 +694,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1857 cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1894 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1938 cmdline/apt-get.cc:2174 +#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1942 cmdline/apt-get.cc:2178 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2032 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -761,7 +761,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:2071 +#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2075 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2080 +#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2084 msgid "Download complete and in download only mode" msgstr "" @@ -886,7 +886,7 @@ msgid "" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1626 +#: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1628 msgid "The following information may help to resolve the situation:" msgstr "" @@ -898,27 +898,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1545 cmdline/apt-get.cc:1581 +#: cmdline/apt-get.cc:1547 cmdline/apt-get.cc:1583 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1568 +#: cmdline/apt-get.cc:1570 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1598 +#: cmdline/apt-get.cc:1600 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1601 +#: cmdline/apt-get.cc:1603 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1613 +#: cmdline/apt-get.cc:1615 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" @@ -926,159 +926,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1621 +#: cmdline/apt-get.cc:1623 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:1629 +#: cmdline/apt-get.cc:1631 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1660 +#: cmdline/apt-get.cc:1662 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1731 +#: cmdline/apt-get.cc:1733 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1732 +#: cmdline/apt-get.cc:1734 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1752 +#: cmdline/apt-get.cc:1754 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1755 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1757 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1760 +#: cmdline/apt-get.cc:1762 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1829 cmdline/apt-get.cc:1837 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1937 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2196 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2007 +#: cmdline/apt-get.cc:2011 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2031 +#: cmdline/apt-get.cc:2035 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2036 +#: cmdline/apt-get.cc:2040 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2039 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2045 +#: cmdline/apt-get.cc:2049 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2076 +#: cmdline/apt-get.cc:2080 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2108 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2120 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:2121 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2134 +#: cmdline/apt-get.cc:2138 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2157 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2173 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2221 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2273 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2325 #, 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:2356 +#: cmdline/apt-get.cc:2360 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2381 +#: cmdline/apt-get.cc:2385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2395 +#: cmdline/apt-get.cc:2399 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2403 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2431 +#: cmdline/apt-get.cc:2435 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2472 +#: cmdline/apt-get.cc:2476 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1558,7 +1558,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:471 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1570,7 +1570,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:510 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1828,10 +1828,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 "" @@ -2123,12 +2119,12 @@ msgstr "" msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:190 +#: apt-pkg/depcache.cc:199 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:196 +#: apt-pkg/depcache.cc:205 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2558,3 +2554,7 @@ msgstr "" #, c-format msgid "Completely removed %s" msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" -- cgit v1.2.3 From e9ae36778e841f09ad195c17004e711bf7b7abae Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Aug 2006 15:08:58 +0200 Subject: * cmdline/apt-get.cc: - added "{no-}install-recommends" option to apt-get * doc/examples/configure-index: - recommends/suggests option documented --- cmdline/apt-get.cc | 1 + doc/examples/configure-index | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6979fa8f2..b419a05d9 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2524,6 +2524,7 @@ int main(int argc,const char *argv[]) {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, + {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f8abd75ed..c4329dfa0 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -90,6 +90,10 @@ APT Cache-Limit "4194304"; Default-Release ""; + // consider Recommends, Suggests as important dependencies that should + // be installed by default + APT::Install-Recommends "false"; + APT::Install-Suggests "false"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; -- cgit v1.2.3 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 'cmdline') 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 omdbt 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, forsger 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 markr" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke lse 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 vedrrer 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 omstte navnet %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Trvandring 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 frigre %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lnke %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen 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 regulrt 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 fuldstndigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Retter afhngigheder..." -#: 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 afhngigheder" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssttet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Frdig" -#: 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 kre 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhngigheder. Prv med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende 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 "Installr 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 fuldfrt" -#: 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 lse 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 lses." -#: 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.. Strrelserne 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 vre 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, gr 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 fortstte, 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 fortstte [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. Prv evt. at kre 'apt-get update' " "eller prv 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 understttes 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 "Bemrk, at %s vlges 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 br eksplicit vlge 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 overfldiggjort 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 flgende 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 lse 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 "Bemrk, vlger %s som regulrt 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 kre '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 afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: 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 tilgngelige." -#: 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 hjst sandsynligt slet\n" "ikke installeres og du br 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 "Flgende oplysninger kan hjlpe 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 "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Foreslede 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 "Frdig" -#: 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. Problemlseren 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 opbygningsafhngigheder 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 opbygningsafhngigheder 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 opbygningsafhngigheder.\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-afhngigheden 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-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "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-afhngigheden 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-afhngigheden 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 "Opbygningsafhngigheden 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 opbygningsafhngighederne" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Understttede 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 viderefrsler" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Kunne ikke udfre 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 omstte 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 afgre ngle-fingeraftryk?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Stdte 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 krsel af gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Flgende 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 afhngighedstr" -#: 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 "Afhngighedsgenerering" -#: 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 "Indst 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' understttes 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 "Indlser 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: Rubn 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 lmite 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 compilacin 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 actualizacin" -#: 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 autenticacin 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 verificacin [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 tamaos 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 utilizarn %sB de espacio de disco adicional despus 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 liberarn %sB despus 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 operacin 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 slo 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, quizs 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 estn 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 instalacin." -#: 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 actualizacin 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 explcitamente 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 slo 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 instalacin" -#: 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 versin ms 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 Distribucin '%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 versin '%s' para '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versin 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 actualizacin 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 expresin 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 solucin)." -#: 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 debera 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 informacin puede ayudar a resolver la situacin:" -#: 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 instalarn 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 actualizacin... " -#: 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 solucin 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 cdigo 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 construccin '%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 construccin" -#: 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 informacin de dependencias de construccin 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 construccin.\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 versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: 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 construccin 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 construccin" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Mdulos 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 tuberas" -#: 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 modificacin" @@ -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 invlida." -#: 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 invlidas:\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 "Generacin 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 conexin 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 donnes 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 donnes 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 donnes %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 contrle" -#: 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 rpertoire %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 rsoudre %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 " Dlier %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 dlier %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 possde 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 possde pas d'entre 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 possde pas d'entre override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr "%s ne possde pas d'entre 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 installs ou enlevs.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Correction des dpendances..." -#: 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 dpendances" -#: 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 problmes." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Dpendances 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 authentifis." -#: 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 vrification (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 authentifis" -#: 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 problmes 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 casss." -#: 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 enlevs mais la dsinstallation est dsactive." -#: 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 rpertoire de tlchargement" -#: 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 ncessaire 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 ncessaire 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 "" "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:840 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\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 dterminer 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 indique mais il ne s'agit pas d'une opration " @@ -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 rcuprer %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 tlchargs." -#: 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 "Tlchargement achev et dans le mode tlchargement 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 rcuprer 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, slection 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 dj install et la mise jour n'est pas prvue.\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 slectionner 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 obsolte\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 rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est dj la plus rcente 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 trouve" -#: 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 rpertoire 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 tlchargement de quelques fichiers d'index a chou, ils ont t " "ignors, ou les anciens ont t utiliss 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, slectionne %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 problmes:" -#: 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 "" "Dpendances 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 crs 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 opration, 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 rsoudre la situation: " -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: 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 rsolution du problme 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 spcifier 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 tlchargement du fichier %s, dj tlcharg\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 "Ncessit 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 "Ncessit 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 "Rcupration 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 rcupration 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 dcompactage des paquets sources dj dcompacts 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 dcompactage %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 vrifier 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 spcifier au moins un paquet pour vrifier les dpendances 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 dpendances 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 dpendance 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 dpendance %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 dpendance %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 dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: 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 dpendances %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 dpendances 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 dpendances 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 cration de tubes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Impossible d'excuter 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 contrle 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-tte %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'accder au porte-cls:%s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: liste de paramtres 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 dterminer " "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 rencontre." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Impossible d'excuter %s pour contrler la signature\n" "(veuillez vrifier si gnupg est install)." -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue l'excution 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 "supplmentaire" -#: 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 dpendances" -#: 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 "Gnration des dpendances" -#: 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 insrer le disque %s dans le lecteur %s et appuyez sur la " "touche Entre." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le systme 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 dterminer un type du systme de paquets adquat" @@ -2811,3 +2822,6 @@ msgstr "%s compl #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion ferme prmaturment" + +#~ 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 Bokml \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, forsker 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 ndd.\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 overstyringsoppfring\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 overstyringsoppfring\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen overstyringsoppfring\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 regulrt 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 " Utfrt" -#: 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 kjre 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 - Prv -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende 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 sltt 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 nr 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 lse 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, gjr 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 fullfrt 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 prve 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 stttes 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 "" "Omgr %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 utgtt, 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 "Flgende 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 lse 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 regulre 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 utfre 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. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: 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 br 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 "Flgende informasjon kan vre til hjelp med lse 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 "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Foresltte 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 "Utfrt" -#: 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 "Omgr 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 "Omgr 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 "Stttede 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 rr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikke kjre 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 "Flgende 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 stttes 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 genstalleerd 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 genstalleerd 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 genstalleerd, 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 " [Genstalleerd]" -#: 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 genstalleerd 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: genstalleerde 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 genstalleerd 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: Hvard 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, forskjer 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 ndd.\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 overstyringsoppfring\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 overstyringsoppfring\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har inga overstyringsoppfring\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 prva retta p desse ved kyra 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. Prv 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 sltt 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 lsa 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 nyaktig %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 prva 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 sttta 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 fr 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 overfldig\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 flgjande 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 fr.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1178 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %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 lsa 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 prva retta p desse ved kyra 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 prva apt-get -f install (eller velja " "ei lysing)." -#: 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 lt seg installera. I sfall br 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 "Flgjande informasjon kan hjelpa med lysa 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 flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1703 msgid "Recommended packages:" msgstr "Tilrdde 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 fr 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 fr 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 "Sttta 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 ryr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra 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 flgjande 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 sttta" -#: 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 plikw w grupie plikw pakietw `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza bya 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 przestarzaa, prbuj 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 udao 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 ulega zmianie %s" +msgid "Failed to stat %s" +msgstr "Nie udao 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 udao si pobra kursora" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie udao 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 mona 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: Bdy 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 udao si przetumaczy nazwy %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Przejcie po drzewie nie powiodo si" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Nie udao si otworzy %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Odczenie %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Nie udao si odczyta dowizania %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Nie udao si usun %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie udao si dowiza %s do %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osignito ograniczenie odczania %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 udao si wykona operacji stat na %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiwum nie posiadao 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 "Bd kompilacji wyraenia 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 peni zainstalowanych lub usunitych.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Naprawianie zalenoci..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:660 msgid " failed." msgstr " nie udao si." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:663 msgid "Unable to correct dependencies" msgstr "Nie udao si naprawi zalenoci" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Nie udao 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 "Naley 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 "Niespenione zalenoci. Sprbuj uy -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Ostrzeenie 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 "Niektre pakiety nie mogy 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 "Byy problemy, a uyto -y bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:763 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Bd wewntrzny, InstallPackages uyto 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 usunite, ale Remove jest wyczone." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: 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 udao 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 udao si odczyta list rde." -#: 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, zgo 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 archiww.\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 archiww.\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 uyte %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 udao si ustali iloci 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 wystarczajcej iloci 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, rb jak mwi!" -#: 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 udao si pobra %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: 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 "Ukoczono 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 udao si pobra niektrych archiww, sprbuj uruchomi apt-get update " "lub uy 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 nonikw nie jest obecnie obsugiwane" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Nie udao si poprawi brakujcych pakietw." -#: 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 zostao 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, wic nie zostanie usunity.\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 "Naley 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 zastpiony przez inny\n" "pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Jednak nastpujce pakiety go zastpuj:" -#: 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 moliwe, nie moe 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 zostao 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 zostaa 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 argumentw" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Nie udao 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 udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " "zostaa uyta ich starsza wersja." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: 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 udao 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 wyraenie '%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 "Naley 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 "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: 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 ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzce\")." -#: 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 naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1587 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1613 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce 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 udao 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 "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: 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 udao si odnale rda 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 wystarczajcej iloci 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 archiww rde.\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 archiww rde.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: 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 rda 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' zawiodo.\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' zawiodo.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2124 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego 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 udao si pobra informacji o zalenociach 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 zalenoci 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 "" "Zaleno %s od %s nie moe zosta speniona, 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 "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "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 udao si speni zalenoci %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 udao si speni zalenoci %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 udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: 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 udao si utworzy potokw" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Nie udao 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 nagwka TAR %u, skadnik %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 udao 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 udao si ustawi czasu modyfikacji" @@ -1892,40 +1903,40 @@ msgstr "Co msgid "Unable to connect to %s %s:" msgstr "Nie udao si poczy z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nie udao si przetumaczy nazwy '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Lista argumentw Acquire::gpgv::Options zbyt duga. Wychodzimy." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Bd wewntrzny: Prawidowa sygnatura, ale nie nie udao si ustali " "jejodcisku?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jedn nieprawidow 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 bd podczas uruchamiania gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Nastpujce sygnatury byy bdne:\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 zalenoci" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Kandydujce wersje" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Generowanie zalenoci" -#: 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 udao 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 udao 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 napdu '%s' dysk o nazwie: '%s' i nacinij enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietw '%s' nie jest obsugiwany" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw" @@ -2755,6 +2766,9 @@ msgstr "Nie uda msgid "Connection closed prematurely" msgstr "Poczenie zostao zamknite przedwczenie" +#~ msgid "File date has changed %s" +#~ msgstr "Data pliku ulega zmianie %s" + #~ msgid "Reading file list" #~ msgstr "Czytanie listy plikw" 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 Lus 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 esto 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 "Impossvel 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 "Repositrio no possui registro de controle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossvel obter um cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossvel ler o diretrio %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossvel 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 "Repositrio no possua 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 no 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, no %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s no possui entrada override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s no 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 compilao 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 no totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:657 msgid "Correcting dependencies..." msgstr "Corrigindo dependncias..." -#: 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 "Impossvel corrigir dependncias" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Impossvel minimizar o conjunto de atualizaes" -#: 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 "Dependncias 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 no podem ser autenticados !" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticao 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 verificao [s/N] ? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:710 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes no 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 remoo est desabilitada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:783 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordenao no 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 "Impossvel criar lock no diretrio 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 no pde 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 no 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 espao em disco sero 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 espao em disco sero 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 "No foi possvel determinar o espao 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 no possui espao 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 no uma operao trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:874 msgid "Yes, do as I say!" msgstr "Sim, faa 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 "" "Impossvel 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 mdia no so suportados atualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Impossvel corrigir pacotes faltosos." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1004 msgid "Aborting install." msgstr "Abortando Instalao." -#: 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 invs 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 atualizao no 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 no est instalado, ento no 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 disponvel 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 no tem candidato para instalao" -#: 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 reinstalao de %s no possvel, o download do mesmo no 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 verso 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' no foi encontrada" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verso '%s' para '%s' no foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Verso 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 no leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1336 msgid "Unable to lock the list directory" msgstr "Impossvel criar lock no diretrio 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 "Impossvel 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 expresso 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 "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: 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 "" "distribuio instvel, que alguns pacotes requeridos no 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 no instalvel 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 informao a seguir pode ajudar a resolver a situao:" -#: 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 sero 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 Atualizao... " -#: 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 "Impossvel 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 no possui espao 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 construo '%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 dependncias " "de construo" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2188 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\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 dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde 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 dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: 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 dependncia %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 dependncia %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 foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2370 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2402 msgid "Supported modules:" msgstr "Mdulos 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 cabealho TAR %u desconhecido, membro %s" @@ -1675,12 +1686,12 @@ msgstr "Disco n msgid "File not found" msgstr "Arquivo 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 "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 modificao" @@ -1892,41 +1903,41 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Impossvel conectar em %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "No foi possvel 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. Sando." -#: 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 no foi possvel determinar a impresso " "digital da chave ?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura invlida 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 invlidas :\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 Dependncias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:61 msgid "Candidate versions" msgstr "Verses Candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:90 msgid "Dependency generation" msgstr "Gerao de Dependncia" -#: 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 "Impossvel 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 "Impossvel 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' no suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" "No foi possvel determinar um tipo de sistema de empacotamento aplicvel." @@ -2768,6 +2779,9 @@ msgstr "Falha ao remover %s" msgid "Connection closed prematurely" msgstr "Conexo 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, poskuam 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 mogoe 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 mogoe najti kazalca" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoe brati imenika %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoe 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 mogoe razreiti %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 mogoe odprti %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVei %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 " Doseena 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 " Vzdrevalec %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 nameenih 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 mogoe popraviti odvisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoe pomanjati 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 "Nereene 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 mogoe 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 "Prilo je do teav 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 onemogoeno." -#: 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 mogoe 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 mogoe 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 sproenega %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 monost 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 mogoe 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 dokonan in uporabljen nain 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 mogoe 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 mogoe popraviti manjkajoih 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 preskoen, ker je e nameen 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 nameen, 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 " [Nameeno]" -#: 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 mona, ker ni moen prenos.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1149 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnoveja razliica %s je e nameena.\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 mogoe najti" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razliice '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %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 mogoe 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 mogoe prenesti, zato so preklicana, ali pa so " "uporabljena stareja." -#: 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 mogoe 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 "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: 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 poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: 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 vloiti poroilo o hrou\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 reiti teavo:" -#: 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 nameeni:" -#: 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 "Priporoeni paketi:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1723 msgid "Calculating upgrade... " msgstr "Preraunavanje 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 mogoe 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 preskoeno\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 mogoe 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 preskoeno\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 "Otroki 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 mogoe 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 mogoe zadostiti, ker ni mogoe 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 mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: 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 mogoe zadostiti %s odvisnosti za %s. Nameen 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 mogoe 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 mogoe 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 mogoe ustvariti pip" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Ni mogoe 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 mogoe 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 "Doloitev 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 mogoe povezati z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Ni mogoe razreiti '%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 nameeni:" -#: 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 "Razliice 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 mogoe razleniti 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 mogoe razleniti 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 mogoe 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 fr %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 "Ngra 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 omdpt till %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB r fr gammal, frsker 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 fr 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 ngon markr" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte lsa 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 gller 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 "Trvandring 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 " Avlnka %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades att lsa lnk %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades att lnka ut %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades att lnka %s till %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlnkningsgrns p %sB ndd.\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" - # Flt vid namn "Package" -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har inget package-flt" -#: 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 fr %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 reguljrt 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 "Rttar 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 rtta beroenden" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:666 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsttningen" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:668 msgid " Done" msgstr " Frdig" -#: 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 mjligen rtta dessa genom att kra \"apt-get -f install\"." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:675 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsstllda beroenden. Frsk med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:697 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Fljande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:701 msgid "Authentication warning overridden.\n" msgstr "Authentiseringsvarning verkrd.\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 "Ngra 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 uppsttt och -y anvndes 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 mste 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 frdigstlldes 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 lsa hmtningskatalogen." -#: 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 kllor kunde inte lsas." -#: 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 stmde 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 "Behver hmta %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 "Behver hmta %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 anvndas.\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 frigras 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 lsa 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 tillrckligt 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, gr som jag sger!" -#: 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 fortstta [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 hmta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:987 msgid "Some files failed to download" msgstr "Misslyckades att hmta 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 "Hmtningen frdig i \"endast-hmta\"-lge" -#: 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 hmtas. Prva 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 stds inte nnu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1003 msgid "Unable to correct missing packages." msgstr "Kunde inte rtta 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, vljer %s istllet fr %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 tillhandahlls 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 br 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 frldrat eller\n" "bara r tillgngligt frn andra kllor\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1118 msgid "However the following packages replace it:" msgstr "Dock kan fljande paket erstta 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 mjlig, det kan inte hmtas.\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 "Utgvan \"%s\" fr \"%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\" fr \"%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) fr %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 lsa 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 hmtas, de har ignorerats eller s har de gamla " "anvnts istllet." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: 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, vljer %s fr 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 mjligen rtta detta genom att kra \"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 "" "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: 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 ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"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 br\n" "skrivas." -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1584 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa 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 "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1702 msgid "Suggested packages:" msgstr "Freslagna 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 "Berknar 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 "Frdig" -#: 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, problemlsaren brt snder saker" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1904 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: 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 ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1978 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar ver redan hmtad 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 tillrckligt 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 "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2016 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2047 msgid "Failed to fetch some archives." msgstr "Misslyckades att hmta 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 kllkod 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 mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2168 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %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 tillfredsstllas 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 tillfredsstllas eftersom inga tillgngliga " "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 fr %s: Det installerade paketet %s " "r fr 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 fr %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 fr %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 stds:" -#: 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 rr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Misslyckades att kra 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 "Frdrvat 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 "Oknd 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 stta 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 frn Acquire::gpgv::Options fr lng. 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 trffades 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\" fr att verifiera signatur (r gnupg installerad?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Oknt fel vid exekvering av gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Fljande 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 beroendetrd" -#: 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\" stds inte" # -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgra en lmpligt paketsystemstyp" @@ -2764,6 +2774,10 @@ msgstr "Tog bort hela %s" msgid "Connection closed prematurely" msgstr "Frbindelsen stngdes i frtid" +# Felmeddelande fr misslyckad chdir +#~ msgid "File date has changed %s" +#~ msgstr "Fildatumet har ndrats %s" + #~ msgid "Reading file list" #~ msgstr "Lser 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 From 8eff320d8061aa7cad48c7eaf834f70e1d3e86b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Aug 2006 21:16:02 +0200 Subject: * cmdline/apt-get.cc: - fix the "fix-policy" code * debian/changelog: - new version --- cmdline/apt-get.cc | 2 +- configure.in | 2 +- debian/changelog | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 96e974acb..4bd66383f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -650,7 +650,7 @@ bool CacheFile::CheckDeps(bool AllowBroken) // 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); + DCache->MarkInstall(I,true,0,false, true); } } diff --git a/configure.in b/configure.in index d9134f4b1..202a15dc0 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.45ubuntu3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 8b8866e7e..0bb679c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 + apt (0.6.45ubuntu3) edgy; urgency=low * ABI break -- cgit v1.2.3 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 'cmdline') 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 From 9d2938d4e6e86c6afdb9606f76f4ae9ce0ac4ee5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Sep 2006 19:12:34 +0200 Subject: * cmdline/apt-get.cc: - always show the autoremove information and give advice how to use it * debian/rules: - install apt.conf.autoremove with blacklist for linux-image and linux-restriceted-modules --- cmdline/apt-get.cc | 45 +++++++++++-------- configure.in | 2 +- debian/apt.conf.autoremove | 8 ++++ debian/apt.dirs | 1 + debian/rules | 2 +- po/apt-all.pot | 108 ++++++++++++++++++++++++--------------------- 6 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 debian/apt.conf.autoremove (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9e7071988..5e1ccb0c0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1392,31 +1392,42 @@ bool DoUpdate(CommandLine &CmdL) /* Remove unused automatic packages */ bool DoAutomaticRemove(CacheFile &Cache) { - if(_config->FindI("Debug::pkgAutoRemove",false)) + bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + pkgDepCache::ActionGroup group(*Cache); + + if(Debug) 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 " "start AutoRemover")); + string autoremovelist, autoremoveversions; + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) { - 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) + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + if(Debug) + std::cout << "We could delete %s" << Pkg.Name() << std::endl; + + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + " "; + if (_config->FindB("APT::Get::AutomaticRemove")) + { + if(Pkg.CurrentVer() != 0 && + Pkg->CurrentState != pkgCache::State::ConfigFiles) Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); - else + else Cache->MarkKeep(Pkg, false, false); - } - } + } + } } + ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!_config->FindB("APT::Get::AutomaticRemove") && + autoremovelist.size() > 0) + c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; // Now see if we destroyed anything if (Cache->BrokenCount() != 0) @@ -1632,10 +1643,8 @@ bool DoInstall(CommandLine &CmdL) return _error->Error(_("Broken packages")); } } - if (_config->FindB("APT::Get::AutomaticRemove")) { - if (!DoAutomaticRemove(Cache)) + if (!DoAutomaticRemove(Cache)) return false; - } /* Print out a list of packages that are going to be installed extra to what the user asked */ diff --git a/configure.in b/configure.in index fc4eff203..f0b0d6703 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.45") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove new file mode 100644 index 000000000..98143ce9a --- /dev/null +++ b/debian/apt.conf.autoremove @@ -0,0 +1,8 @@ +APT +{ + NeverAutoRemove + { + "^linux-image.*"; + "^linux-restricted-modules.*"; + }; +}; diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738fa..1543e8bb1 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/apt.conf.d etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/rules b/debian/rules index 044f742d0..6a142e759 100755 --- a/debian/rules +++ b/debian/rules @@ -211,7 +211,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog dh_installexamples -p$@ $(BLD)/docs/examples/* diff --git a/po/apt-all.pot b/po/apt-all.pot index 2dd720674..0a7a30629 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:03+0200\n" +"POT-Creation-Date: 2006-09-06 18:58+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:2449 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2455 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:1561 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1569 #, 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:1880 cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1886 cmdline/apt-get.cc:1919 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1961 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2203 #: 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:2051 +#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2057 #, 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:2094 +#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2100 #, 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:2103 +#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2109 msgid "Download complete and in download only mode" msgstr "" @@ -887,49 +887,55 @@ msgid "" "used instead." msgstr "" -#: cmdline/apt-get.cc:1399 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1424 +#: cmdline/apt-get.cc:1427 +msgid "" +"The following packages where automatically installed and are no longer " +"required:" +msgstr "" + +#: cmdline/apt-get.cc:1432 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:1629 +#: cmdline/apt-get.cc:1435 cmdline/apt-get.cc:1637 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1431 +#: cmdline/apt-get.cc:1439 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1450 +#: cmdline/apt-get.cc:1458 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1548 cmdline/apt-get.cc:1584 +#: cmdline/apt-get.cc:1556 cmdline/apt-get.cc:1592 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1571 +#: cmdline/apt-get.cc:1579 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1601 +#: cmdline/apt-get.cc:1609 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1604 +#: cmdline/apt-get.cc:1612 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1616 +#: cmdline/apt-get.cc:1624 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" @@ -937,159 +943,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 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:1632 +#: cmdline/apt-get.cc:1640 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1663 +#: cmdline/apt-get.cc:1669 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1752 +#: cmdline/apt-get.cc:1758 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1759 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1773 +#: cmdline/apt-get.cc:1779 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1776 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1782 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1781 +#: cmdline/apt-get.cc:1787 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1848 cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1854 cmdline/apt-get.cc:1862 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1956 +#: cmdline/apt-get.cc:1962 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1986 cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2221 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2036 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2054 +#: cmdline/apt-get.cc:2060 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2062 +#: cmdline/apt-get.cc:2068 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2074 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2105 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2133 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2139 +#: cmdline/apt-get.cc:2145 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2146 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2157 +#: cmdline/apt-get.cc:2163 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2176 +#: cmdline/apt-get.cc:2182 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2198 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2240 +#: cmdline/apt-get.cc:2246 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2292 +#: cmdline/apt-get.cc:2298 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2350 #, 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:2379 +#: cmdline/apt-get.cc:2385 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2404 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2424 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2422 +#: cmdline/apt-get.cc:2428 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2454 +#: cmdline/apt-get.cc:2460 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2501 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -- cgit v1.2.3 From c15f569038c9d08cfb5186945d9c5095f7776768 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Sep 2006 19:36:31 +0200 Subject: * apt-pkg/algorithms.cc: - bugfix in the InstallProcted() code (preserver the auto-install information) * cmdline/makefile: - install apt-mark as well --- apt-pkg/algorithms.cc | 9 +++++++-- cmdline/makefile | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'cmdline') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index ac9d3be0b..55f44fbd5 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1229,8 +1229,13 @@ void pkgProblemResolver::InstallProtect() { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I, false, 0, false); + else + { + // preserver the information if the package was auto + // or manual installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } diff --git a/cmdline/makefile b/cmdline/makefile index 882a0e1b5..49035be44 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -52,3 +52,9 @@ SOURCE=apt-key TO=$(BIN) TARGET=program include $(COPY_H) + +# The apt-mark program +SOURCE=apt-mark +TO=$(BIN) +TARGET=program +include $(COPY_H) -- cgit v1.2.3 From c97fd4ec4a34eb15eb8985890a47e768f4b94f0d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 11:32:32 +0200 Subject: * cmdline/apt-get.cc: - only error out if both "APT::Get::Autoremove" is set to true and "APT::Get::Remove" to false, in this case the the save options wins and apt will abort --- cmdline/apt-get.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5e1ccb0c0..411b16e90 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1398,7 +1398,8 @@ bool DoAutomaticRemove(CacheFile &Cache) if(Debug) std::cout << "DoAutomaticRemove()" << std::endl; - if (_config->FindB("APT::Get::Remove",true) == false) + if (_config->FindB("APT::Get::AutomaticRemove") && + _config->FindB("APT::Get::Remove",true) == false) return _error->Error(_("We are not supposed to delete stuff, can't " "start AutoRemover")); -- cgit v1.2.3 From 3d0de656b6263d51c288d82ef2b352e53023382c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 11:52:19 +0200 Subject: * cmdline/apt-get.cc: - changed the behaviour of --no-remove and --auto-remove, if --no-remove is given, then that will turn off --auto-remove implicitely --- cmdline/apt-get.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 411b16e90..4af23641b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1393,15 +1393,20 @@ bool DoUpdate(CommandLine &CmdL) bool DoAutomaticRemove(CacheFile &Cache) { bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove"); pkgDepCache::ActionGroup group(*Cache); + if(Debug) std::cout << "DoAutomaticRemove()" << std::endl; - if (_config->FindB("APT::Get::AutomaticRemove") && - _config->FindB("APT::Get::Remove",true) == false) - return _error->Error(_("We are not supposed to delete stuff, can't " - "start AutoRemover")); + if (_config->FindB("APT::Get::Remove",true) == false && + doAutoRemove == true) + { + c1out << _("We are not supposed to delete stuff, can't start " + "AutoRemover") << std::endl; + doAutoRemove = false; + } string autoremovelist, autoremoveversions; // look over the cache to see what can be removed @@ -1415,7 +1420,7 @@ bool DoAutomaticRemove(CacheFile &Cache) autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + " "; - if (_config->FindB("APT::Get::AutomaticRemove")) + if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) @@ -1426,8 +1431,7 @@ bool DoAutomaticRemove(CacheFile &Cache) } } ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions); - if (!_config->FindB("APT::Get::AutomaticRemove") && - autoremovelist.size() > 0) + if (!doAutoRemove && autoremovelist.size() > 0) c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; // Now see if we destroyed anything -- cgit v1.2.3 From ae24ac67f6bbab1474a5386b946fc7bd97ad86c8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 11:53:26 +0200 Subject: * cmdline/apt-get.cc: - typo --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4af23641b..570e1016c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1430,7 +1430,7 @@ bool DoAutomaticRemove(CacheFile &Cache) } } } - ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); if (!doAutoRemove && autoremovelist.size() > 0) c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; -- cgit v1.2.3 From c158ff49dacb8f6fdca98f9b43329eac44f1a827 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 14:02:53 +0200 Subject: * tasksupport (apt-get installtask lala) added --- Makefile | 4 +-- cmdline/apt-get.cc | 56 +++++++++++++++++++++++++++++++ po/apt-all.pot | 98 +++++++++++++++++++++++++++--------------------------- 3 files changed, 107 insertions(+), 51 deletions(-) (limited to 'cmdline') diff --git a/Makefile b/Makefile index 72cac61b5..b35ad4a0d 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ - $(MAKE) -C po $@ +# $(MAKE) -C doc $@ +# $(MAKE) -C po $@ # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 64882e3e8..9705f84dc 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1406,6 +1406,61 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// DoInstallTask - Install task from the command line /*{{{*/ +// --------------------------------------------------------------------- +/* Install named task */ +bool DoInstallTask(CommandLine &CmdL) +{ + const char *start, *end; + pkgCache::PkgIterator Pkg; + + CacheFile Cache; + if (Cache.OpenForInstall() == false || + Cache.CheckDeps(CmdL.FileSize() != 1) == false) + return false; + + // create the records parser + pkgRecords Recs(Cache); + + unsigned int ExpectedInst = 0; + unsigned int Packages = 0; + pkgProblemResolver Fix(Cache); + char buf[64*1024]; + + for (const char **I = CmdL.FileList + 1; *I != 0; I++) + { + regex_t Pattern; + int Res; + + // build regexp for the task + char S[300]; + snprintf(S, sizeof(S), "^Task:.*%s.*\n", *I); + regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + + for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = (*Cache)[Pkg].CandidateVerIter(*Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst); + } + } + + // Call the scored problem resolver + Fix.InstallProtect(); + if (Fix.Resolve(true) == false) + _error->Discard(); + + // prompt for install + return InstallPackages(Cache,false,true); +} + // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -2546,6 +2601,7 @@ int main(int argc,const char *argv[]) CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate}, {"upgrade",&DoUpgrade}, {"install",&DoInstall}, + {"installtask",&DoInstallTask}, {"remove",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, diff --git a/po/apt-all.pot b/po/apt-all.pot index 352f2f5a6..006a07bfc 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-09-19 13:29+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:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2430 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:1549 #, 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:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1894 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1942 cmdline/apt-get.cc:2178 #: 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:1989 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:2032 #, 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:2032 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2075 #, 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:2041 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2084 msgid "Download complete and in download only mode" msgstr "" @@ -891,27 +891,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1536 cmdline/apt-get.cc:1572 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1559 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1589 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1592 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:1604 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:1612 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:1617 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1620 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1646 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1735 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1736 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1756 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1759 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1764 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1829 cmdline/apt-get.cc:1837 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:1937 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2196 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2011 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2035 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2040 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2049 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2080 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2108 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2120 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2121 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2138 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2157 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2173 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2221 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2273 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2325 #, 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:2317 +#: cmdline/apt-get.cc:2360 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2399 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2403 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2435 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2476 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2112,12 +2112,12 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:160 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -- cgit v1.2.3 From ab04fa68f216974b277c708ab0788ef8798f879f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 15:41:52 +0200 Subject: * cmdline/apt-get.cc: - install with FixBroken=true --- cmdline/apt-get.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9705f84dc..57e0e9ec7 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1434,7 +1434,7 @@ bool DoInstallTask(CommandLine &CmdL) // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*%s.*\n", *I); + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", *I); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) @@ -1448,14 +1448,13 @@ bool DoInstallTask(CommandLine &CmdL) buf[end-start] = 0x0; if (regexec(&Pattern,buf,0,0,0) != 0) continue; - TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst); + TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); } } // Call the scored problem resolver Fix.InstallProtect(); - if (Fix.Resolve(true) == false) - _error->Discard(); + Fix.Resolve(true); // prompt for install return InstallPackages(Cache,false,true); -- cgit v1.2.3 From d6df222d8edb3e38401affcee2a4e5eba605da32 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 16:06:06 +0200 Subject: * cmdline/apt-get.cc: - call regexp_free() --- cmdline/apt-get.cc | 4 +-- po/apt-all.pot | 94 +++++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 57e0e9ec7..2062aaa16 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1423,14 +1423,12 @@ bool DoInstallTask(CommandLine &CmdL) pkgRecords Recs(Cache); unsigned int ExpectedInst = 0; - unsigned int Packages = 0; pkgProblemResolver Fix(Cache); char buf[64*1024]; for (const char **I = CmdL.FileList + 1; *I != 0; I++) { regex_t Pattern; - int Res; // build regexp for the task char S[300]; @@ -1450,6 +1448,8 @@ bool DoInstallTask(CommandLine &CmdL) continue; TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); } + + regfree(&Pattern); } // Call the scored problem resolver diff --git a/po/apt-all.pot b/po/apt-all.pot index 006a07bfc..d4c3a4ff7 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-19 13:29+0200\n" +"POT-Creation-Date: 2006-09-19 15:56+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:2430 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2441 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:1549 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1560 #, 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:1861 cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1872 cmdline/apt-get.cc:1905 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1942 cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1953 cmdline/apt-get.cc:2189 #: 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:2032 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:2043 #, 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:2075 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2086 #, 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:2084 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2095 msgid "Download complete and in download only mode" msgstr "" @@ -891,27 +891,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1536 cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1547 cmdline/apt-get.cc:1583 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1570 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1589 +#: cmdline/apt-get.cc:1600 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1603 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1604 +#: cmdline/apt-get.cc:1615 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:1612 +#: cmdline/apt-get.cc:1623 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:1617 +#: cmdline/apt-get.cc:1628 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1620 +#: cmdline/apt-get.cc:1631 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1646 +#: cmdline/apt-get.cc:1657 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1746 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1736 +#: cmdline/apt-get.cc:1747 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1767 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1759 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1770 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1764 +#: cmdline/apt-get.cc:1775 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1829 cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1840 cmdline/apt-get.cc:1848 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1937 +#: cmdline/apt-get.cc:1948 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:2207 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2011 +#: cmdline/apt-get.cc:2022 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2035 +#: cmdline/apt-get.cc:2046 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2051 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2043 +#: cmdline/apt-get.cc:2054 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2049 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2080 +#: cmdline/apt-get.cc:2091 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2108 +#: cmdline/apt-get.cc:2119 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2120 +#: cmdline/apt-get.cc:2131 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2132 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2149 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2157 +#: cmdline/apt-get.cc:2168 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2173 +#: cmdline/apt-get.cc:2184 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2201 +#: cmdline/apt-get.cc:2212 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2232 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2284 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2336 #, 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:2360 +#: cmdline/apt-get.cc:2371 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2396 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2403 +#: cmdline/apt-get.cc:2414 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2446 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2487 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -- cgit v1.2.3 From 39cc1bbdd0faa13dcb150b573f56cd2dd64fa460 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 17:22:41 +0200 Subject: * cmdline/apt-get.cc: - changed syntax from "installtask" to "install taskname^" (the ^ <- makes it look for tasks) --- cmdline/apt-get.cc | 86 ++++++++++++++++++++++++----------------------- po/apt-all.pot | 99 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 96 insertions(+), 89 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2062aaa16..09bf572a5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1409,55 +1409,46 @@ bool DoUpgrade(CommandLine &CmdL) // DoInstallTask - Install task from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named task */ -bool DoInstallTask(CommandLine &CmdL) +bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, + bool BrokenFix, + unsigned int& ExpectedInst, + const char *taskname) { const char *start, *end; pkgCache::PkgIterator Pkg; + char buf[64*1024]; + regex_t Pattern; - CacheFile Cache; - if (Cache.OpenForInstall() == false || - Cache.CheckDeps(CmdL.FileSize() != 1) == false) - return false; - - // create the records parser + // get the records pkgRecords Recs(Cache); - - unsigned int ExpectedInst = 0; - pkgProblemResolver Fix(Cache); - char buf[64*1024]; - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + // build regexp for the task + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname); + regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + + bool found = false; + bool res = true; + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) { - regex_t Pattern; - - // build regexp for the task - char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", *I); - regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - pkgCache::VerIterator ver = (*Cache)[Pkg].CandidateVerIter(*Cache); - if(ver.end()) - continue; - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - parser.GetRec(start,end); - strncpy(buf, start, end-start); - buf[end-start] = 0x0; - if (regexec(&Pattern,buf,0,0,0) != 0) - continue; - TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); - } - - regfree(&Pattern); + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,false,BrokenFix,ExpectedInst); + found = true; } - - // Call the scored problem resolver - Fix.InstallProtect(); - Fix.Resolve(true); - // prompt for install - return InstallPackages(Cache,false,true); + if(!found) + _error->Error(_("Couldn't find task %s"),taskname); + + regfree(&Pattern); + return res; } // DoInstall - Install packages from the command line /*{{{*/ @@ -1496,6 +1487,18 @@ bool DoInstall(CommandLine &CmdL) bool Remove = DefRemove; char *VerTag = 0; bool VerIsRel = false; + + // this is a task! + if (Length >= 1 && S[Length - 1] == '^') + { + S[--Length] = 0; + // tasks must always be confirmed + ExpectedInst += 1000; + // see if we can install it + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S); + continue; + } + while (Cache->FindPkg(S).end() == true) { // Handle an optional end tag indicating what to do @@ -1512,7 +1515,7 @@ bool DoInstall(CommandLine &CmdL) S[--Length] = 0; continue; } - + char *Slash = strchr(S,'='); if (Slash != 0) { @@ -2600,7 +2603,6 @@ int main(int argc,const char *argv[]) CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate}, {"upgrade",&DoUpgrade}, {"install",&DoInstall}, - {"installtask",&DoInstallTask}, {"remove",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, diff --git a/po/apt-all.pot b/po/apt-all.pot index d4c3a4ff7..46299c8b6 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-19 15:56+0200\n" +"POT-Creation-Date: 2006-09-19 17:21+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:2441 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2444 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:1560 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1563 #, 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:1872 cmdline/apt-get.cc:1905 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1875 cmdline/apt-get.cc:1908 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1953 cmdline/apt-get.cc:2189 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1956 cmdline/apt-get.cc:2192 #: 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:2043 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:2046 #, 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:2086 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2089 #, 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:2095 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2098 msgid "Download complete and in download only mode" msgstr "" @@ -891,27 +891,32 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1448 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1550 cmdline/apt-get.cc:1586 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1570 +#: cmdline/apt-get.cc:1573 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1600 +#: cmdline/apt-get.cc:1603 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1606 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1615 +#: cmdline/apt-get.cc:1618 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 +924,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 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:1628 +#: cmdline/apt-get.cc:1631 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1634 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1657 +#: cmdline/apt-get.cc:1660 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1746 +#: cmdline/apt-get.cc:1749 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1747 +#: cmdline/apt-get.cc:1750 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1770 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1770 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1773 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1775 +#: cmdline/apt-get.cc:1778 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1840 cmdline/apt-get.cc:1848 +#: cmdline/apt-get.cc:1843 cmdline/apt-get.cc:1851 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1948 +#: cmdline/apt-get.cc:1951 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:2207 +#: cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2210 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2022 +#: cmdline/apt-get.cc:2025 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2049 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2051 +#: cmdline/apt-get.cc:2054 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2054 +#: cmdline/apt-get.cc:2057 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2063 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:2094 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2119 +#: cmdline/apt-get.cc:2122 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2131 +#: cmdline/apt-get.cc:2134 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2132 +#: cmdline/apt-get.cc:2135 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2171 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2187 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:2235 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2284 +#: cmdline/apt-get.cc:2287 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2339 #, 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:2371 +#: cmdline/apt-get.cc:2374 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2396 +#: cmdline/apt-get.cc:2399 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2413 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2417 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2446 +#: cmdline/apt-get.cc:2449 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2490 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -- cgit v1.2.3 From b255ff1a1161385b7f52454ec8661f058f05d6db Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 15:13:45 +0200 Subject: * cmdline/apt-get.cc: - fix problem that AutomaticRemove can't be set permanently via preferences --- cmdline/apt-get.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 570e1016c..9b6e36e21 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1393,7 +1393,7 @@ bool DoUpdate(CommandLine &CmdL) bool DoAutomaticRemove(CacheFile &Cache) { bool Debug = _config->FindI("Debug::pkgAutoRemove",false); - bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove"); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); pkgDepCache::ActionGroup group(*Cache); @@ -2560,7 +2560,6 @@ void GetInitialize() _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); - _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ -- cgit v1.2.3 From e406c1756b00ad725988c0da792330f8cf5d63f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Mar 2007 12:00:21 +0100 Subject: * cmdline/apt-get.cc: - fix show-versions output --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9b6e36e21..6c1b915ab 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1419,7 +1419,7 @@ bool DoAutomaticRemove(CacheFile &Cache) std::cout << "We could delete %s" << Pkg.Name() << std::endl; autoremovelist += string(Pkg.Name()) + " "; - autoremoveversions += string(Cache[Pkg].CandVersion) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && -- cgit v1.2.3 From e4b74e4b347ccde887a3d7d8a585dcf264e13305 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 12:41:37 +0100 Subject: * cmdline/apt-get.cc: - apt-get install foo for a already installed package foo that is marked "auto" will clear the auto-flag --- cmdline/apt-get.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6c1b915ab..8f4e17898 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1484,6 +1484,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; + unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; unsigned int Packages = 0; pkgProblemResolver Fix(Cache); @@ -1606,6 +1607,18 @@ bool DoInstall(CommandLine &CmdL) return false; if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if(Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto)) + { + ioprintf(c1out,_("%s set to manual installed.\n"), + Pkg.Name()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } } } @@ -1768,6 +1781,14 @@ bool DoInstall(CommandLine &CmdL) } + // if nothing changed in the cache, but only the automark information + // we write the StateFile here, otherwise it will be written in + // cache.commit() + if (AutoMarkChanged > 0 && + Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + Cache->writeStateFile(NULL); + // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); -- cgit v1.2.3 From fd59a713400968e1e9f35a7eaeea08b58e77c53b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 13:47:42 +0100 Subject: * cmdline/apt-get.cc: - do not clean the auto-flag in "remove" mode (e.g. apt-get remove already-installed-pkg) - only show packages in the auto-remove list that are not already marked for removal --- cmdline/apt-get.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 8f4e17898..ed1ef98be 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1417,9 +1417,13 @@ bool DoAutomaticRemove(CacheFile &Cache) if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) std::cout << "We could delete %s" << Pkg.Name() << std::endl; - - autoremovelist += string(Pkg.Name()) + " "; - autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && @@ -1611,7 +1615,8 @@ bool DoInstall(CommandLine &CmdL) // see if we need to fix the auto-mark flag // e.g. apt-get install foo // where foo is marked automatic - if(Cache[Pkg].Install() == false && + if(!Remove && + Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto)) { ioprintf(c1out,_("%s set to manual installed.\n"), -- cgit v1.2.3 From 7898bd970a791bb8892b0dfdffc683828a447900 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 13:57:57 +0100 Subject: * cmdline/apt-get.cc: - applied patch from Frode M. Døving to have APT::Get::HideAutoRemove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-get.cc | 7 ++++--- doc/examples/configure-index | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ed1ef98be..e8e5a8c39 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1394,8 +1394,8 @@ bool DoAutomaticRemove(CacheFile &Cache) { bool Debug = _config->FindI("Debug::pkgAutoRemove",false); bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); + bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); pkgDepCache::ActionGroup group(*Cache); - if(Debug) std::cout << "DoAutomaticRemove()" << std::endl; @@ -1434,8 +1434,9 @@ bool DoAutomaticRemove(CacheFile &Cache) } } } - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); - if (!doAutoRemove && autoremovelist.size() > 0) + if (!hideAutoRemove) + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0) c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; // Now see if we destroyed anything diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 32b7168a0..d3e061f9a 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -33,6 +33,7 @@ APT { Arch-Only "false"; AutomaticRemove "false"; + HideAutoRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; -- cgit v1.2.3 From 54eda6ae969cd66d06fe82f7175f753a74d2b7dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 17:11:31 +0100 Subject: cmdline/apt-mark: fix chmod()/rename() ordering --- cmdline/apt-mark | 1 + 1 file changed, 1 insertion(+) (limited to 'cmdline') diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 533ed8715..dadc01366 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -60,4 +60,5 @@ if __name__ == "__main__": else: outfile.write(str(tagfile.Section)+"\n") # all done, rename the tmpfile + os.chmod(outfile.name, 0644) os.rename(outfile.name, STATE_FILE) -- cgit v1.2.3