diff options
164 files changed, 14389 insertions, 10263 deletions
diff --git a/.travis.yml b/.travis.yml index b413134c5..2852db483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ language: cpp before_install: - sudo apt-get update -q - sudo ./prepare-release travis-ci - - sudo apt-get install -q --no-install-recommends stunnel4 + - sudo apt-get install -q --no-install-recommends stunnel4 db-util script: make && make test && test/integration/run-tests diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 592d402ec..70d03b845 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -50,12 +50,24 @@ using namespace std; +static void printHashSumComparision(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/ +{ + if (_config->FindB("Debug::Acquire::HashSumMismatch", false) == false) + return; + std::cerr << std::endl << URI << ":" << std::endl << " Expected Hash: " << std::endl; + for (HashStringList::const_iterator hs = Expected.begin(); hs != Expected.end(); ++hs) + std::cerr << "\t- " << hs->toStr() << std::endl; + std::cerr << " Actual Hash: " << std::endl; + for (HashStringList::const_iterator hs = Actual.begin(); hs != Actual.end(); ++hs) + std::cerr << "\t- " << hs->toStr() << std::endl; +} + /*}}}*/ + // Acquire::Item::Item - Constructor /*{{{*/ -// --------------------------------------------------------------------- -/* */ -pkgAcquire::Item::Item(pkgAcquire *Owner) : Owner(Owner), FileSize(0), - PartialSize(0), Mode(0), ID(0), Complete(false), - Local(false), QueueCounter(0) +pkgAcquire::Item::Item(pkgAcquire *Owner, HashStringList const &ExpectedHashes) : + Owner(Owner), FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), + Local(false), QueueCounter(0), ExpectedAdditionalItems(0), + ExpectedHashes(ExpectedHashes) { Owner->Add(this); Status = StatIdle; @@ -117,7 +129,7 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size) // Acquire::Item::Done - Item downloaded OK /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcquire::Item::Done(string Message,unsigned long long Size,string /*Hash*/, +void pkgAcquire::Item::Done(string Message,unsigned long long Size,HashStringList const &/*Hash*/, pkgAcquire::MethodConfig * /*Cnf*/) { // We just downloaded something.. @@ -228,8 +240,8 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) possibly query additional files */ pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire *Owner, string const &URI, string const &URIDesc, string const &ShortDesc, - HashString const &ExpectedHash) - : Item(Owner), ExpectedHash(ExpectedHash) + HashStringList const &ExpectedHashes) + : Item(Owner, ExpectedHashes) { /* XXX: Beware: Currently this class does nothing (of value) anymore ! */ Debug = _config->FindB("Debug::pkgAcquire::SubIndex",false); @@ -251,7 +263,7 @@ pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire *Owner, string const &URI, // AcqSubIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqSubIndex::Custom600Headers() +string pkgAcqSubIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(Desc.URI); @@ -274,7 +286,7 @@ void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/* // No good Index is provided } /*}}}*/ -void pkgAcqSubIndex::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/ +void pkgAcqSubIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) @@ -296,7 +308,7 @@ void pkgAcqSubIndex::Done(string Message,unsigned long long Size,string Md5Hash, return; } - Item::Done(Message,Size,Md5Hash,Cnf); + Item::Done(Message, Size, Hashes, Cnf); string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI); @@ -342,21 +354,22 @@ bool pkgAcqSubIndex::ParseIndex(string const &IndexFile) /*{{{*/ * the original packages file */ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, - string URI,string URIDesc,string ShortDesc, - HashString ExpectedHash) - : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), - Description(URIDesc) + IndexTarget const * const Target, + HashStringList const &ExpectedHashes, + indexRecords *MetaIndexParser) + : pkgAcqBaseIndex(Owner, Target, ExpectedHashes, MetaIndexParser) { Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); - Desc.Description = URIDesc + "/DiffIndex"; + RealURI = Target->URI; Desc.Owner = this; - Desc.ShortDesc = ShortDesc; - Desc.URI = URI + ".diff/Index"; + Desc.Description = Target->Description + "/DiffIndex"; + Desc.ShortDesc = Target->ShortDesc; + Desc.URI = Target->URI + ".diff/Index"; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(URI) + string(".DiffIndex"); + DestFile += URItoFileName(Target->URI) + string(".DiffIndex"); if(Debug) std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl; @@ -389,7 +402,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqDiffIndex::Custom600Headers() +string pkgAcqDiffIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI) + string(".IndexDiff"); @@ -442,8 +455,8 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ std::clog << "Package file is up-to-date" << std::endl; // list cleanup needs to know that this file as well as the already // present index is ours, so we create an empty diff to save it for us - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, ServerSha1, available_patches); + new pkgAcqIndexDiffs(Owner, Target, ExpectedHashes, MetaIndexParser, + ServerSha1, available_patches); return true; } else @@ -528,14 +541,19 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ } if (pdiff_merge == false) - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, ServerSha1, available_patches); - else + { + new pkgAcqIndexDiffs(Owner, Target, ExpectedHashes, MetaIndexParser, + ServerSha1, available_patches); + } + else { std::vector<pkgAcqIndexMergeDiffs*> *diffs = new std::vector<pkgAcqIndexMergeDiffs*>(available_patches.size()); for(size_t i = 0; i < available_patches.size(); ++i) - (*diffs)[i] = new pkgAcqIndexMergeDiffs(Owner, RealURI, Description, Desc.ShortDesc, ExpectedHash, - available_patches[i], diffs); + (*diffs)[i] = new pkgAcqIndexMergeDiffs(Owner, Target, + ExpectedHashes, + MetaIndexParser, + available_patches[i], + diffs); } Complete = false; @@ -559,21 +577,20 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)/ std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << " with " << Message << std::endl << "Falling back to normal index file acquire" << std::endl; - new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash); + new pkgAcqIndex(Owner, Target, ExpectedHashes, MetaIndexParser); Complete = false; Status = StatDone; Dequeue(); } /*}}}*/ -void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/ +void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl; - Item::Done(Message,Size,Md5Hash,Cnf); + Item::Done(Message, Size, Hashes, Cnf); string FinalFile; FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); @@ -603,22 +620,24 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,string Md5Hash * for each diff and the index */ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, - string URI,string URIDesc,string ShortDesc, - HashString ExpectedHash, + struct IndexTarget const * const Target, + HashStringList const &ExpectedHashes, + indexRecords *MetaIndexParser, string ServerSha1, vector<DiffInfo> diffs) - : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), + : pkgAcqBaseIndex(Owner, Target, ExpectedHashes, MetaIndexParser), available_patches(diffs), ServerSha1(ServerSha1) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(URI); + DestFile += URItoFileName(Target->URI); Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); - Description = URIDesc; + RealURI = Target->URI; Desc.Owner = this; - Desc.ShortDesc = ShortDesc; + Description = Target->Description; + Desc.ShortDesc = Target->ShortDesc; if(available_patches.empty() == true) { @@ -638,8 +657,7 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/) if(Debug) std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl << "Falling back to normal index file acquire" << std::endl; - new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, - ExpectedHash); + new pkgAcqIndex(Owner, Target, ExpectedHashes, MetaIndexParser); Finish(); } /*}}}*/ @@ -653,7 +671,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone) DestFile = _config->FindDir("Dir::State::lists"); DestFile += URItoFileName(RealURI); - if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile)) + if(HashSums().usable() && !HashSums().VerifyFile(DestFile)) { RenameOnError(HashSumMismatch); Dequeue(); @@ -731,13 +749,13 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ return true; } /*}}}*/ -void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/ +void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringList const &Hashes, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl; - Item::Done(Message,Size,Md5Hash,Cnf); + Item::Done(Message, Size, Hashes, Cnf); string FinalFile; FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); @@ -779,8 +797,9 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has // see if there is more to download if(available_patches.empty() == false) { - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, ServerSha1, available_patches); + new pkgAcqIndexDiffs(Owner, Target, + ExpectedHashes, MetaIndexParser, + ServerSha1, available_patches); return Finish(); } else return Finish(true); @@ -789,22 +808,24 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has /*}}}*/ // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor /*{{{*/ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner, - string const &URI, string const &URIDesc, - string const &ShortDesc, HashString const &ExpectedHash, - DiffInfo const &patch, - std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches) - : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), - patch(patch),allPatches(allPatches), State(StateFetchDiff) + struct IndexTarget const * const Target, + HashStringList const &ExpectedHashes, + indexRecords *MetaIndexParser, + DiffInfo const &patch, + std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches) + : pkgAcqBaseIndex(Owner, Target, ExpectedHashes, MetaIndexParser), + patch(patch), allPatches(allPatches), State(StateFetchDiff) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(URI); + DestFile += URItoFileName(Target->URI); Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); - Description = URIDesc; + RealURI = Target->URI; Desc.Owner = this; - Desc.ShortDesc = ShortDesc; + Description = Target->Description; + Desc.ShortDesc = Target->ShortDesc; Desc.URI = RealURI + ".diff/" + patch.file + ".gz"; Desc.Description = Description + " " + patch.file + string(".pdiff"); @@ -835,17 +856,16 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*C // first failure means we should fallback State = StateErrorDiff; std::clog << "Falling back to normal index file acquire" << std::endl; - new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, - ExpectedHash); + new pkgAcqIndex(Owner, Target, ExpectedHashes, MetaIndexParser); } /*}}}*/ -void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string Md5Hash, /*{{{*/ +void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) std::clog << "pkgAcqIndexMergeDiffs::Done(): " << Desc.URI << std::endl; - Item::Done(Message,Size,Md5Hash,Cnf); + Item::Done(Message,Size,Hashes,Cnf); string const FinalFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); @@ -881,7 +901,7 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M else if (State == StateApplyDiff) { // see if we really got the expected file - if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile)) + if(ExpectedHashes.usable() && !ExpectedHashes.VerifyFile(DestFile)) { RenameOnError(HashSumMismatch); return; @@ -918,8 +938,8 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M instantiated to fetch the revision file */ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - HashString ExpectedHash, string comprExt) - : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash) + HashStringList const &ExpectedHash, string comprExt) + : pkgAcqBaseIndex(Owner, NULL, ExpectedHash, NULL), RealURI(URI) { if(comprExt.empty() == true) { @@ -937,13 +957,15 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, Init(URI, URIDesc, ShortDesc); } pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target, - HashString const &ExpectedHash, indexRecords const *MetaIndexParser) - : Item(Owner), RealURI(Target->URI), ExpectedHash(ExpectedHash) + HashStringList const &ExpectedHash, + indexRecords *MetaIndexParser) + : pkgAcqBaseIndex(Owner, Target, ExpectedHash, MetaIndexParser), + RealURI(Target->URI) { // autoselect the compression method std::vector<std::string> types = APT::Configuration::getCompressionTypes(); CompressionExtension = ""; - if (ExpectedHash.empty() == false) + if (ExpectedHashes.usable()) { for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t) if (*t == "uncompressed" || MetaIndexParser->Exists(string(Target->MetaKey).append(".").append(*t)) == true) @@ -976,10 +998,27 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S DestFile += URItoFileName(URI); std::string const comprExt = CompressionExtension.substr(0, CompressionExtension.find(' ')); + std::string MetaKey; if (comprExt == "uncompressed") + { Desc.URI = URI; + if(Target) + MetaKey = string(Target->MetaKey); + } else + { Desc.URI = URI + '.' + comprExt; + if(Target) + MetaKey = string(Target->MetaKey) + '.' + comprExt; + } + + // load the filesize + if(MetaIndexParser) + { + indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey); + if(Record) + FileSize = Record->Size; + } Desc.Description = URIDesc; Desc.Owner = this; @@ -991,7 +1030,7 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqIndex::Custom600Headers() +string pkgAcqIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); @@ -1037,22 +1076,17 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ to the uncompressed version of the file. If this is so the file is copied into the partial directory. In all other cases the file is decompressed with a gzip uri. */ -void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, +void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,Hash,Cfg); + Item::Done(Message,Size,Hashes,Cfg); if (Decompression == true) { - if (_config->FindB("Debug::pkgAcquire::Auth", false)) - { - std::cerr << std::endl << RealURI << ": Computed Hash: " << Hash; - std::cerr << " Expected Hash: " << ExpectedHash.toStr() << std::endl; - } - - if (!ExpectedHash.empty() && ExpectedHash.toStr() != Hash) + if (ExpectedHashes.usable() && ExpectedHashes != Hashes) { RenameOnError(HashSumMismatch); + printHashSumComparision(RealURI, ExpectedHashes, Hashes); return; } @@ -1081,7 +1115,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, FinalFile += URItoFileName(RealURI); Rename(DestFile,FinalFile); chmod(FinalFile.c_str(),0644); - + /* We restore the original name to DestFile so that the clean operation will work OK */ DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -1090,6 +1124,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, // Remove the compressed version. if (Erase == true) unlink(DestFile.c_str()); + return; } @@ -1173,18 +1208,22 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash, /* The Translation file is added to the queue */ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc) - : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "") + : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashStringList(), "") { } -pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, IndexTarget const *Target, - HashString const &ExpectedHash, indexRecords const *MetaIndexParser) - : pkgAcqIndex(Owner, Target, ExpectedHash, MetaIndexParser) +pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, IndexTarget const * const Target, + HashStringList const &ExpectedHashes, indexRecords *MetaIndexParser) + : pkgAcqIndex(Owner, Target, ExpectedHashes, MetaIndexParser) { + // load the filesize + indexRecords::checkSum *Record = MetaIndexParser->Lookup(string(Target->MetaKey)); + if(Record) + FileSize = Record->Size; } /*}}}*/ // AcqIndexTrans::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- -string pkgAcqIndexTrans::Custom600Headers() +string pkgAcqIndexTrans::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); @@ -1228,7 +1267,7 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ string MetaIndexShortDesc, const vector<IndexTarget*>* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI), + Item(Owner, HashStringList()), RealURI(URI), MetaIndexURI(MetaIndexURI), MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc), MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { @@ -1259,6 +1298,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ Rename(Final,LastGoodSig); } + // we expect the indextargets + one additional Release file + ExpectedAdditionalItems = IndexTargets->size() + 1; + QueueURI(Desc); } /*}}}*/ @@ -1278,7 +1320,7 @@ pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/ // pkgAcqMetaSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqMetaSig::Custom600Headers() +string pkgAcqMetaSig::Custom600Headers() const { struct stat Buf; if (stat(LastGoodSig.c_str(),&Buf) != 0) @@ -1287,10 +1329,10 @@ string pkgAcqMetaSig::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } -void pkgAcqMetaSig::Done(string Message,unsigned long long Size,string MD5, +void pkgAcqMetaSig::Done(string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,MD5,Cfg); + Item::Done(Message, Size, Hashes, Cfg); string FileName = LookupTag(Message,"Filename"); if (FileName.empty() == true) @@ -1311,6 +1353,9 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,string MD5, Complete = true; + // at this point pkgAcqMetaIndex takes over + ExpectedAdditionalItems = 0; + // put the last known good file back on i-m-s hit (it will // be re-verified again) // Else do nothing, we have the new file in DestFile then @@ -1328,6 +1373,9 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/ { string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + // at this point pkgAcqMetaIndex takes over + ExpectedAdditionalItems = 0; + // if we get a network error we fail gracefully if(Status == StatTransientNetworkError) { @@ -1366,7 +1414,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, /*{{{*/ string SigFile, const vector<IndexTarget*>* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets), + Item(Owner, HashStringList()), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets), MetaIndexParser(MetaIndexParser), AuthPass(false), IMSHit(false) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -1378,13 +1426,16 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, /*{{{*/ Desc.ShortDesc = ShortDesc; Desc.URI = URI; + // we expect more item + ExpectedAdditionalItems = IndexTargets->size(); + QueueURI(Desc); } /*}}}*/ // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqMetaIndex::Custom600Headers() +string pkgAcqMetaIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); @@ -1396,10 +1447,10 @@ string pkgAcqMetaIndex::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ -void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, /*{{{*/ +void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/ pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,Hash,Cfg); + Item::Done(Message,Size,Hashes,Cfg); // MetaIndexes are done in two passes: one to download the // metaindex with an appropriate method, and a second to verify it @@ -1428,9 +1479,20 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, / } else { + // FIXME: move this into pkgAcqMetaClearSig::Done on the next + // ABI break + + // if we expect a ClearTextSignature (InRelase), ensure that + // this is what we get and if not fail to queue a + // Release/Release.gpg, see #346386 + if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile)) + { + Failed(Message, Cfg); + return; + } + // There was a signature file, so pass it to gpgv for // verification - if (_config->FindB("Debug::pkgAcquire::Auth", false)) std::cerr << "Metaindex acquired, queueing gpg verification (" << SigFile << "," << DestFile << ")\n"; @@ -1556,11 +1618,13 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ } } + // at this point the real Items are loaded in the fetcher + ExpectedAdditionalItems = 0; for (vector <IndexTarget*>::const_iterator Target = IndexTargets->begin(); Target != IndexTargets->end(); ++Target) { - HashString ExpectedIndexHash; + HashStringList ExpectedIndexHashes; const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey); bool compressedAvailable = false; if (Record == NULL) @@ -1584,14 +1648,16 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ } else { - ExpectedIndexHash = Record->Hash; + ExpectedIndexHashes = Record->Hashes; if (_config->FindB("Debug::pkgAcquire::Auth", false)) { - std::cerr << "Queueing: " << (*Target)->URI << std::endl; - std::cerr << "Expected Hash: " << ExpectedIndexHash.toStr() << std::endl; + std::cerr << "Queueing: " << (*Target)->URI << std::endl + << "Expected Hash:" << std::endl; + for (HashStringList::const_iterator hs = ExpectedIndexHashes.begin(); hs != ExpectedIndexHashes.end(); ++hs) + std::cerr << "\t- " << hs->toStr() << std::endl; std::cerr << "For: " << Record->MetaKeyFilename << std::endl; } - if (verify == true && ExpectedIndexHash.empty() == true && (*Target)->IsOptional() == false) + if (verify == true && ExpectedIndexHashes.empty() == true && (*Target)->IsOptional() == false) { Status = StatAuthError; strprintf(ErrorText, _("Unable to find hash sum for '%s' in Release file"), (*Target)->MetaKey.c_str()); @@ -1603,15 +1669,14 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { if ((*Target)->IsSubIndex() == true) new pkgAcqSubIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexHash); + (*Target)->ShortDesc, ExpectedIndexHashes); else if (transInRelease == false || Record != NULL || compressedAvailable == true) { if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true && MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true) - new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexHash); + new pkgAcqDiffIndex(Owner, *Target, ExpectedIndexHashes, MetaIndexParser); else - new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHash, MetaIndexParser); + new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHashes, MetaIndexParser); } continue; } @@ -1622,10 +1687,9 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ instead, but passing the required info to it is to much hassle */ if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false || MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true)) - new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexHash); + new pkgAcqDiffIndex(Owner, *Target, ExpectedIndexHashes, MetaIndexParser); else - new pkgAcqIndex(Owner, *Target, ExpectedIndexHash, MetaIndexParser); + new pkgAcqIndex(Owner, *Target, ExpectedIndexHashes, MetaIndexParser); } } /*}}}*/ @@ -1786,6 +1850,10 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/ { SigFile = DestFile; + // index targets + (worst case:) Release/Release.gpg + ExpectedAdditionalItems = IndexTargets->size() + 2; + + // keep the old InRelease around in case of transistent network errors string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); if (RealFileExists(Final) == true) @@ -1810,7 +1878,7 @@ pkgAcqMetaClearSig::~pkgAcqMetaClearSig() /*{{{*/ // pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- // FIXME: this can go away once the InRelease file is used widely -string pkgAcqMetaClearSig::Custom600Headers() +string pkgAcqMetaClearSig::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); @@ -1828,6 +1896,9 @@ string pkgAcqMetaClearSig::Custom600Headers() /*}}}*/ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ { + // we failed, we will not get additional items from this method + ExpectedAdditionalItems = 0; + if (AuthPass == false) { // Remove the 'old' InRelease file if we try Release.gpg now as otherwise @@ -1856,7 +1927,7 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /* pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs,pkgCache::VerIterator const &Version, string &StoreFilename) : - Item(Owner), Version(Version), Sources(Sources), Recs(Recs), + Item(Owner, HashStringList()), Version(Version), Sources(Sources), Recs(Recs), StoreFilename(StoreFilename), Vf(Version.FileList()), Trusted(false) { @@ -1941,7 +2012,6 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, checking later. */ bool pkgAcqArchive::QueueNext() { - string const ForceHash = _config->Find("Acquire::ForceHash"); for (; Vf.end() == false; ++Vf) { // Ignore not source sources @@ -1962,31 +2032,10 @@ bool pkgAcqArchive::QueueNext() pkgRecords::Parser &Parse = Recs->Lookup(Vf); if (_error->PendingError() == true) return false; - + string PkgFile = Parse.FileName(); - if (ForceHash.empty() == false) - { - if(stringcasecmp(ForceHash, "sha512") == 0) - ExpectedHash = HashString("SHA512", Parse.SHA512Hash()); - else if(stringcasecmp(ForceHash, "sha256") == 0) - ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); - else if (stringcasecmp(ForceHash, "sha1") == 0) - ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); - else - ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); - } - else - { - string Hash; - if ((Hash = Parse.SHA512Hash()).empty() == false) - ExpectedHash = HashString("SHA512", Hash); - else if ((Hash = Parse.SHA256Hash()).empty() == false) - ExpectedHash = HashString("SHA256", Hash); - else if ((Hash = Parse.SHA1Hash()).empty() == false) - ExpectedHash = HashString("SHA1", Hash); - else - ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); - } + ExpectedHashes = Parse.Hashes(); + if (PkgFile.empty() == true) return _error->Error(_("The package index files are corrupted. No Filename: " "field for package %s."), @@ -2073,10 +2122,10 @@ bool pkgAcqArchive::QueueNext() // AcqArchive::Done - Finished fetching /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqArchive::Done(string Message,unsigned long long Size,string CalcHash, +void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList const &CalcHashes, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,CalcHash,Cfg); + Item::Done(Message, Size, CalcHashes, Cfg); // Check the size if (Size != Version->Size) @@ -2084,11 +2133,12 @@ void pkgAcqArchive::Done(string Message,unsigned long long Size,string CalcHash, RenameOnError(SizeMismatch); return; } - - // Check the hash - if(ExpectedHash.toStr() != CalcHash) + + // FIXME: could this empty() check impose *any* sort of security issue? + if(ExpectedHashes.usable() && ExpectedHashes != CalcHashes) { RenameOnError(HashSumMismatch); + printHashSumComparision(DestFile, ExpectedHashes, CalcHashes); return; } @@ -2160,7 +2210,7 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*}}}*/ // AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/ // --------------------------------------------------------------------- -APT_PURE bool pkgAcqArchive::IsTrusted() +APT_PURE bool pkgAcqArchive::IsTrusted() const { return Trusted; } @@ -2179,11 +2229,11 @@ void pkgAcqArchive::Finished() // AcqFile::pkgAcqFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The file is added to the queue */ -pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, +pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI, HashStringList const &Hashes, unsigned long long Size,string Dsc,string ShortDesc, const string &DestDir, const string &DestFilename, bool IsIndexFile) : - Item(Owner), ExpectedHash(Hash), IsIndexFile(IsIndexFile) + Item(Owner, Hashes), IsIndexFile(IsIndexFile) { Retries = _config->FindI("Acquire::Retries",0); @@ -2220,15 +2270,16 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, // AcqFile::Done - Item downloaded OK /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqFile::Done(string Message,unsigned long long Size,string CalcHash, +void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList const &CalcHashes, pkgAcquire::MethodConfig *Cnf) { - Item::Done(Message,Size,CalcHash,Cnf); + Item::Done(Message,Size,CalcHashes,Cnf); // Check the hash - if(!ExpectedHash.empty() && ExpectedHash.toStr() != CalcHash) + if(ExpectedHashes.usable() && ExpectedHashes != CalcHashes) { RenameOnError(HashSumMismatch); + printHashSumComparision(DestFile, ExpectedHashes, CalcHashes); return; } @@ -2299,7 +2350,7 @@ void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf) // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqFile::Custom600Headers() +string pkgAcqFile::Custom600Headers() const { if (IsIndexFile) return "\nIndex-File: true"; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index bc21d5c56..6e204813a 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -167,6 +167,16 @@ class pkgAcquire::Item : public WeakPointable * \sa pkgAcquire */ unsigned int QueueCounter; + + /** \brief The number of additional fetch items that are expected + * once this item is done. + * + * Some items like pkgAcqMeta{Index,Sig} will queue additional + * items. This variable can be set by the methods if it knows + * in advance how many items to expect to get a more accurate + * progress. + */ + unsigned int ExpectedAdditionalItems; /** \brief The name of the file into which the retrieved object * will be written. @@ -202,12 +212,12 @@ class pkgAcquire::Item : public WeakPointable * \param Message Data from the acquire method. Use LookupTag() * to parse it. * \param Size The size of the object that was fetched. - * \param Hash The HashSum of the object that was fetched. + * \param Hashes The HashSums of the object that was fetched. * \param Cnf The method via which the object was fetched. * * \sa pkgAcqMethod */ - virtual void Done(std::string Message,unsigned long long Size,std::string Hash, + virtual void Done(std::string Message, unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); /** \brief Invoked when the worker starts to fetch this object. @@ -229,34 +239,35 @@ class pkgAcquire::Item : public WeakPointable * line, so they should (if nonempty) have a leading newline and * no trailing newline. */ - virtual std::string Custom600Headers() {return std::string();}; + virtual std::string Custom600Headers() const {return std::string();}; /** \brief A "descriptive" URI-like string. * * \return a URI that should be used to describe what is being fetched. */ - virtual std::string DescURI() = 0; + virtual std::string DescURI() const = 0; /** \brief Short item description. * * \return a brief description of the object being fetched. */ - virtual std::string ShortDesc() {return DescURI();} + virtual std::string ShortDesc() const {return DescURI();} /** \brief Invoked by the worker when the download is completely done. */ virtual void Finished() {}; - /** \brief HashSum + /** \brief HashSums * - * \return the HashSum of this object, if applicable; otherwise, an - * empty string. + * \return the HashSums of this object, if applicable; otherwise, an + * empty list. */ - virtual std::string HashSum() {return std::string();}; + HashStringList HashSums() const {return ExpectedHashes;}; + std::string HashSum() const {HashStringList const hashes = HashSums(); HashString const * const hs = hashes.find(NULL); return hs != NULL ? hs->toStr() : ""; }; /** \return the acquire process with which this item is associated. */ - pkgAcquire *GetOwner() {return Owner;}; + pkgAcquire *GetOwner() const {return Owner;}; /** \return \b true if this object is being fetched from a trusted source. */ - virtual bool IsTrusted() {return false;}; + virtual bool IsTrusted() const {return false;}; // report mirror problems /** \brief Report mirror problem @@ -275,12 +286,10 @@ class pkgAcquire::Item : public WeakPointable * process, but does not place it into any fetch queues (you must * manually invoke QueueURI() to do so). * - * Initializes all fields of the item other than Owner to 0, - * false, or the empty string. - * * \param Owner The new owner of this item. + * \param ExpectedHashes of the file represented by this item */ - Item(pkgAcquire *Owner); + Item(pkgAcquire *Owner, HashStringList const &ExpectedHashes); /** \brief Remove this item from its owner's queue by invoking * pkgAcquire::Remove. @@ -300,6 +309,12 @@ class pkgAcquire::Item : public WeakPointable * \param state respresenting the error we encountered */ bool RenameOnError(RenameOnErrorState const state); + + /** \brief The HashSums of the item is supposed to have than done */ + HashStringList ExpectedHashes; + + /** \brief The item that is currently being downloaded. */ + pkgAcquire::ItemDesc Desc; }; /*}}}*/ /** \brief Information about an index patch (aka diff). */ /*{{{*/ @@ -326,20 +341,13 @@ class pkgAcqSubIndex : public pkgAcquire::Item /** \brief If \b true, debugging information will be written to std::clog. */ bool Debug; - /** \brief The item that is currently being downloaded. */ - pkgAcquire::ItemDesc Desc; - - /** \brief The Hash that this file should have after download - */ - HashString ExpectedHash; - public: // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return Desc.URI;}; - virtual std::string Custom600Headers(); + virtual std::string DescURI() const {return Desc.URI;}; + virtual std::string Custom600Headers() const; virtual bool ParseIndex(std::string const &IndexFile); /** \brief Create a new pkgAcqSubIndex. @@ -352,10 +360,31 @@ class pkgAcqSubIndex : public pkgAcquire::Item * * \param ShortDesc A short description of the list file to download. * - * \param ExpectedHash The list file's MD5 signature. + * \param ExpectedHashes The list file's hashsums which are expected. */ pkgAcqSubIndex(pkgAcquire *Owner, std::string const &URI,std::string const &URIDesc, - std::string const &ShortDesc, HashString const &ExpectedHash); + std::string const &ShortDesc, HashStringList const &ExpectedHashes); +}; + /*}}}*/ + +/** \brief Common base class for all classes that deal with fetching {{{ + indexes + */ +class pkgAcqBaseIndex : public pkgAcquire::Item +{ + protected: + /** \brief Pointer to the IndexTarget data + */ + const struct IndexTarget * Target; + indexRecords *MetaIndexParser; + + pkgAcqBaseIndex(pkgAcquire *Owner, + struct IndexTarget const * const Target, + HashStringList const &ExpectedHashes, + indexRecords *MetaIndexParser) + : Item(Owner, ExpectedHashes), Target(Target), + MetaIndexParser(MetaIndexParser) {}; + }; /*}}}*/ /** \brief An item that is responsible for fetching an index file of {{{ @@ -367,25 +396,17 @@ class pkgAcqSubIndex : public pkgAcquire::Item * * \sa pkgAcqIndexDiffs, pkgAcqIndex */ -class pkgAcqDiffIndex : public pkgAcquire::Item +class pkgAcqDiffIndex : public pkgAcqBaseIndex { protected: /** \brief If \b true, debugging information will be written to std::clog. */ bool Debug; - /** \brief The item that is currently being downloaded. */ - pkgAcquire::ItemDesc Desc; - /** \brief The URI of the index file to recreate at our end (either * by downloading it or by applying partial patches). */ std::string RealURI; - /** \brief The Hash that the real index file should have after - * all patches have been applied. - */ - HashString ExpectedHash; - /** \brief The index file which will be patched to generate the new * file. */ @@ -399,10 +420,10 @@ class pkgAcqDiffIndex : public pkgAcquire::Item public: // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return RealURI + "Index";}; - virtual std::string Custom600Headers(); + virtual std::string DescURI() const {return RealURI + "Index";}; + virtual std::string Custom600Headers() const; /** \brief Parse the Index file for a set of Packages diffs. * @@ -427,10 +448,12 @@ class pkgAcqDiffIndex : public pkgAcquire::Item * * \param ShortDesc A short description of the list file to download. * - * \param ExpectedHash The list file's MD5 signature. + * \param ExpectedHashes The list file's hashsums which are expected. */ - pkgAcqDiffIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc, - std::string ShortDesc, HashString ExpectedHash); + pkgAcqDiffIndex(pkgAcquire *Owner, + struct IndexTarget const * const Target, + HashStringList const &ExpectedHashes, + indexRecords *MetaIndexParser); }; /*}}}*/ /** \brief An item that is responsible for fetching client-merge patches {{{ @@ -444,7 +467,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item * * \sa pkgAcqDiffIndex, pkgAcqIndex */ -class pkgAcqIndexMergeDiffs : public pkgAcquire::Item +class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex { protected: @@ -453,21 +476,11 @@ class pkgAcqIndexMergeDiffs : public pkgAcquire::Item */ bool Debug; - /** \brief description of the item that is currently being - * downloaded. - */ - pkgAcquire::ItemDesc Desc; - /** \brief URI of the package index file that is being * reconstructed. */ std::string RealURI; - /** \brief HashSum of the package index file that is being - * reconstructed. - */ - HashString ExpectedHash; - /** \brief description of the file being downloaded. */ std::string Description; @@ -500,10 +513,9 @@ class pkgAcqIndexMergeDiffs : public pkgAcquire::Item * outright; its arguments are ignored. */ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, - pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return RealURI + "Index";}; + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, + pkgAcquire::MethodConfig *Cnf); + virtual std::string DescURI() const {return RealURI + "Index";}; /** \brief Create an index merge-diff item. * @@ -516,7 +528,7 @@ class pkgAcqIndexMergeDiffs : public pkgAcquire::Item * * \param ShortDesc A brief description of this item. * - * \param ExpectedHash The expected md5sum of the completely + * \param ExpectedHashes The expected md5sum of the completely * reconstructed package index file; the index file will be tested * against this value when it is entirely reconstructed. * @@ -526,9 +538,12 @@ class pkgAcqIndexMergeDiffs : public pkgAcquire::Item * \param allPatches contains all related items so that each item can * check if it was the last one to complete the download step */ - pkgAcqIndexMergeDiffs(pkgAcquire *Owner,std::string const &URI,std::string const &URIDesc, - std::string const &ShortDesc, HashString const &ExpectedHash, - DiffInfo const &patch, std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches); + pkgAcqIndexMergeDiffs(pkgAcquire *Owner, + struct IndexTarget const * const Target, + HashStringList const &ExpectedHash, + indexRecords *MetaIndexParser, + DiffInfo const &patch, + std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches); }; /*}}}*/ /** \brief An item that is responsible for fetching server-merge patches {{{ @@ -542,7 +557,7 @@ class pkgAcqIndexMergeDiffs : public pkgAcquire::Item * * \sa pkgAcqDiffIndex, pkgAcqIndex */ -class pkgAcqIndexDiffs : public pkgAcquire::Item +class pkgAcqIndexDiffs : public pkgAcqBaseIndex { private: @@ -560,8 +575,8 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item /** \brief Handle tasks that must be performed after the item * finishes downloading. * - * Dequeues the item and checks the resulting file's md5sum - * against ExpectedHash after the last patch was applied. + * Dequeues the item and checks the resulting file's hashsums + * against ExpectedHashes after the last patch was applied. * There is no need to check the md5/sha1 after a "normal" * patch because QueueNextDiff() will check the sha1 later. * @@ -577,21 +592,11 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item */ bool Debug; - /** \brief A description of the item that is currently being - * downloaded. - */ - pkgAcquire::ItemDesc Desc; - /** \brief The URI of the package index file that is being * reconstructed. */ std::string RealURI; - /** \brief The HashSum of the package index file that is being - * reconstructed. - */ - HashString ExpectedHash; - /** A description of the file being downloaded. */ std::string Description; @@ -633,9 +638,9 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item */ virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return RealURI + "Index";}; + virtual std::string DescURI() const {return RealURI + "Index";}; /** \brief Create an index diff item. * @@ -651,7 +656,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * * \param ShortDesc A brief description of this item. * - * \param ExpectedHash The expected md5sum of the completely + * \param ExpectedHashes The expected md5sum of the completely * reconstructed package index file; the index file will be tested * against this value when it is entirely reconstructed. * @@ -661,8 +666,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * should be ordered so that each diff appears before any diff * that depends on it. */ - pkgAcqIndexDiffs(pkgAcquire *Owner,std::string URI,std::string URIDesc, - std::string ShortDesc, HashString ExpectedHash, + pkgAcqIndexDiffs(pkgAcquire *Owner, + struct IndexTarget const * const Target, + HashStringList const &ExpectedHash, + indexRecords *MetaIndexParser, std::string ServerSha1, std::vector<DiffInfo> diffs=std::vector<DiffInfo>()); }; @@ -674,7 +681,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * * \todo Why does pkgAcqIndex have protected members? */ -class pkgAcqIndex : public pkgAcquire::Item +class pkgAcqIndex : public pkgAcqBaseIndex { protected: @@ -696,19 +703,11 @@ class pkgAcqIndex : public pkgAcquire::Item // the downloaded file contains the expected tag bool Verify; - /** \brief The download request that is currently being - * processed. - */ - pkgAcquire::ItemDesc Desc; - /** \brief The object that is actually being fetched (minus any * compression-related extensions). */ std::string RealURI; - /** \brief The expected hashsum of the decompressed index file. */ - HashString ExpectedHash; - /** \brief The compression-related file extensions that are being * added to the downloaded file one by one if first fails (e.g., "gz bz2"). */ @@ -718,11 +717,10 @@ class pkgAcqIndex : public pkgAcquire::Item // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string Custom600Headers(); - virtual std::string DescURI() {return Desc.URI;}; - virtual std::string HashSum() {return ExpectedHash.toStr(); }; + virtual std::string Custom600Headers() const; + virtual std::string DescURI() const {return Desc.URI;}; /** \brief Create a pkgAcqIndex. * @@ -735,7 +733,7 @@ class pkgAcqIndex : public pkgAcquire::Item * * \param ShortDesc A brief description of this index file. * - * \param ExpectedHash The expected hashsum of this index file. + * \param ExpectedHashes The expected hashsum of this index file. * * \param compressExt The compression-related extension with which * this index file should be downloaded, or "" to autodetect @@ -744,11 +742,14 @@ class pkgAcqIndex : public pkgAcquire::Item * fallback is ".gz" or none. */ pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc, - std::string ShortDesc, HashString ExpectedHash, + std::string ShortDesc, HashStringList const &ExpectedHashes, std::string compressExt=""); - pkgAcqIndex(pkgAcquire *Owner, IndexTarget const * const Target, - HashString const &ExpectedHash, indexRecords const *MetaIndexParser); - void Init(std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc); + pkgAcqIndex(pkgAcquire *Owner, + IndexTarget const * const Target, + HashStringList const &ExpectedHash, + indexRecords *MetaIndexParser); + void Init(std::string const &URI, std::string const &URIDesc, + std::string const &ShortDesc); }; /*}}}*/ /** \brief An acquire item that is responsible for fetching a {{{ @@ -763,7 +764,7 @@ class pkgAcqIndexTrans : public pkgAcqIndex public: virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual std::string Custom600Headers(); + virtual std::string Custom600Headers() const; /** \brief Create a pkgAcqIndexTrans. * @@ -779,7 +780,7 @@ class pkgAcqIndexTrans : public pkgAcqIndex pkgAcqIndexTrans(pkgAcquire *Owner,std::string URI,std::string URIDesc, std::string ShortDesc); pkgAcqIndexTrans(pkgAcquire *Owner, IndexTarget const * const Target, - HashString const &ExpectedHash, indexRecords const *MetaIndexParser); + HashStringList const &ExpectedHashes, indexRecords *MetaIndexParser); }; /*}}}*/ /** \brief Information about an index file. */ /*{{{*/ @@ -847,9 +848,6 @@ class pkgAcqMetaSig : public pkgAcquire::Item /** \brief The last good signature file */ std::string LastGoodSig; - /** \brief The fetch request that is currently being processed. */ - pkgAcquire::ItemDesc Desc; - /** \brief The URI of the signature file. Unlike Desc.URI, this is * never modified; it is used to determine the file that is being * downloaded. @@ -883,10 +881,10 @@ class pkgAcqMetaSig : public pkgAcquire::Item // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string Custom600Headers(); - virtual std::string DescURI() {return RealURI; }; + virtual std::string Custom600Headers() const; + virtual std::string DescURI() const {return RealURI; }; /** \brief Create a new pkgAcqMetaSig. */ pkgAcqMetaSig(pkgAcquire *Owner,std::string URI,std::string URIDesc, std::string ShortDesc, @@ -909,9 +907,6 @@ class pkgAcqMetaSig : public pkgAcquire::Item class pkgAcqMetaIndex : public pkgAcquire::Item { protected: - /** \brief The fetch command that is currently being processed. */ - pkgAcquire::ItemDesc Desc; - /** \brief The URI that is actually being downloaded; never * modified by pkgAcqMetaIndex. */ @@ -979,10 +974,10 @@ class pkgAcqMetaIndex : public pkgAcquire::Item // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size, std::string Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string Custom600Headers(); - virtual std::string DescURI() {return RealURI; }; + virtual std::string Custom600Headers() const; + virtual std::string DescURI() const {return RealURI; }; /** \brief Create a new pkgAcqMetaIndex. */ pkgAcqMetaIndex(pkgAcquire *Owner, @@ -1015,7 +1010,7 @@ class pkgAcqMetaClearSig : public pkgAcqMetaIndex public: void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual std::string Custom600Headers(); + virtual std::string Custom600Headers() const; /** \brief Create a new pkgAcqMetaClearSig. */ pkgAcqMetaClearSig(pkgAcquire *Owner, @@ -1038,9 +1033,6 @@ class pkgAcqArchive : public pkgAcquire::Item /** \brief The package version being fetched. */ pkgCache::VerIterator Version; - /** \brief The fetch command that is currently being processed. */ - pkgAcquire::ItemDesc Desc; - /** \brief The list of sources from which to pick archives to * download this package from. */ @@ -1051,9 +1043,6 @@ class pkgAcqArchive : public pkgAcquire::Item */ pkgRecords *Recs; - /** \brief The hashsum of this package. */ - HashString ExpectedHash; - /** \brief A location in which the actual filename of the package * should be stored. */ @@ -1080,13 +1069,12 @@ class pkgAcqArchive : public pkgAcquire::Item public: virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string Hash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return Desc.URI;}; - virtual std::string ShortDesc() {return Desc.ShortDesc;}; + virtual std::string DescURI() const {return Desc.URI;}; + virtual std::string ShortDesc() const {return Desc.ShortDesc;}; virtual void Finished(); - virtual std::string HashSum() {return ExpectedHash.toStr(); }; - virtual bool IsTrusted(); + virtual bool IsTrusted() const; /** \brief Create a new pkgAcqArchive. * @@ -1119,12 +1107,6 @@ class pkgAcqArchive : public pkgAcquire::Item */ class pkgAcqFile : public pkgAcquire::Item { - /** \brief The currently active download process. */ - pkgAcquire::ItemDesc Desc; - - /** \brief The hashsum of the file to download, if it is known. */ - HashString ExpectedHash; - /** \brief How many times to retry the download, set from * Acquire::Retries. */ @@ -1137,11 +1119,10 @@ class pkgAcqFile : public pkgAcquire::Item // Specialized action members virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(std::string Message,unsigned long long Size,std::string CalcHash, + virtual void Done(std::string Message,unsigned long long Size, HashStringList const &CalcHashes, pkgAcquire::MethodConfig *Cnf); - virtual std::string DescURI() {return Desc.URI;}; - virtual std::string HashSum() {return ExpectedHash.toStr(); }; - virtual std::string Custom600Headers(); + virtual std::string DescURI() const {return Desc.URI;}; + virtual std::string Custom600Headers() const; /** \brief Create a new pkgAcqFile object. * @@ -1150,8 +1131,8 @@ class pkgAcqFile : public pkgAcquire::Item * * \param URI The URI to download. * - * \param Hash The hashsum of the file to download, if it is known; - * otherwise "". + * \param Hashes The hashsums of the file to download, if they are known; + * otherwise empty list. * * \param Size The size of the file to download, if it is known; * otherwise 0. @@ -1174,7 +1155,7 @@ class pkgAcqFile : public pkgAcquire::Item * is the absolute name to which the file should be downloaded. */ - pkgAcqFile(pkgAcquire *Owner, std::string URI, std::string Hash, unsigned long long Size, + pkgAcqFile(pkgAcquire *Owner, std::string URI, HashStringList const &Hashes, unsigned long long Size, std::string Desc, std::string ShortDesc, const std::string &DestDir="", const std::string &DestFilename="", bool IsIndexFile=false); diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 746c553f1..e4a937d1d 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -147,6 +147,16 @@ void pkgAcqMethod::URIStart(FetchResult &Res) // AcqMethod::URIDone - A URI is finished /*{{{*/ // --------------------------------------------------------------------- /* */ +static void printHashStringList(HashStringList const * const list) +{ + for (HashStringList::const_iterator hash = list->begin(); hash != list->end(); ++hash) + { + // very old compatibility name for MD5Sum + if (hash->HashType() == "MD5Sum") + std::cout << "MD5-Hash: " << hash->HashValue() << "\n"; + std::cout << hash->HashType() << "-Hash: " << hash->HashValue() << "\n"; + } +} void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) { if (Queue == 0) @@ -164,15 +174,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Res.LastModified != 0) std::cout << "Last-Modified: " << TimeRFC1123(Res.LastModified) << "\n"; - if (Res.MD5Sum.empty() == false) - std::cout << "MD5-Hash: " << Res.MD5Sum << "\n" - << "MD5Sum-Hash: " << Res.MD5Sum << "\n"; - if (Res.SHA1Sum.empty() == false) - std::cout << "SHA1-Hash: " << Res.SHA1Sum << "\n"; - if (Res.SHA256Sum.empty() == false) - std::cout << "SHA256-Hash: " << Res.SHA256Sum << "\n"; - if (Res.SHA512Sum.empty() == false) - std::cout << "SHA512-Hash: " << Res.SHA512Sum << "\n"; + printHashStringList(&Res.Hashes); + if (UsedMirror.empty() == false) std::cout << "UsedMirror: " << UsedMirror << "\n"; if (Res.GPGVOutput.empty() == false) @@ -200,15 +203,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Alt->LastModified != 0) std::cout << "Alt-Last-Modified: " << TimeRFC1123(Alt->LastModified) << "\n"; - if (Alt->MD5Sum.empty() == false) - std::cout << "Alt-MD5-Hash: " << Alt->MD5Sum << "\n"; - if (Alt->SHA1Sum.empty() == false) - std::cout << "Alt-SHA1-Hash: " << Alt->SHA1Sum << "\n"; - if (Alt->SHA256Sum.empty() == false) - std::cout << "Alt-SHA256-Hash: " << Alt->SHA256Sum << "\n"; - if (Alt->SHA512Sum.empty() == false) - std::cout << "Alt-SHA512-Hash: " << Alt->SHA512Sum << "\n"; - + printHashStringList(&Alt->Hashes); + if (Alt->IMSHit == true) std::cout << "Alt-IMS-Hit: true\n"; } @@ -355,6 +351,15 @@ int pkgAcqMethod::Run(bool Single) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); Tmp->FailIgnore = StringToBool(LookupTag(Message,"Fail-Ignore"),false); + Tmp->ExpectedHashes = HashStringList(); + for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t) + { + std::string tag = "Expected-"; + tag.append(*t); + std::string const hash = LookupTag(Message, tag.c_str()); + if (hash.empty() == false) + Tmp->ExpectedHashes.push_back(HashString(*t, hash)); + } Tmp->Next = 0; // Append it to the list @@ -442,12 +447,9 @@ pkgAcqMethod::FetchResult::FetchResult() : LastModified(0), // --------------------------------------------------------------------- /* This hides the number of hashes we are supporting from the caller. It just deals with the hash class. */ -void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash) +void pkgAcqMethod::FetchResult::TakeHashes(class Hashes &Hash) { - MD5Sum = Hash.MD5.Result(); - SHA1Sum = Hash.SHA1.Result(); - SHA256Sum = Hash.SHA256.Result(); - SHA512Sum = Hash.SHA512.Result(); + Hashes = Hash.GetHashStringList(); } /*}}}*/ void pkgAcqMethod::Dequeue() { /*{{{*/ diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 221ccf273..cbf79f860 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -20,6 +20,7 @@ #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H +#include <apt-pkg/hashes.h> #include <apt-pkg/macros.h> #include <stdarg.h> @@ -33,7 +34,6 @@ #include <apt-pkg/strutl.h> #endif -class Hashes; class pkgAcqMethod { protected: @@ -47,14 +47,12 @@ class pkgAcqMethod time_t LastModified; bool IndexFile; bool FailIgnore; + HashStringList ExpectedHashes; }; struct FetchResult { - std::string MD5Sum; - std::string SHA1Sum; - std::string SHA256Sum; - std::string SHA512Sum; + HashStringList Hashes; std::vector<std::string> GPGVOutput; time_t LastModified; bool IMSHit; @@ -62,7 +60,7 @@ class pkgAcqMethod unsigned long long Size; unsigned long long ResumePoint; - void TakeHashes(Hashes &Hash); + void TakeHashes(class Hashes &Hash); FetchResult(); }; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 047a655ce..54be8e99f 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -326,25 +326,30 @@ bool pkgAcquire::Worker::RunMessages() Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize); // see if there is a hash to verify - string RecivedHash; - HashString expectedHash(Owner->HashSum()); - if(!expectedHash.empty()) + HashStringList RecivedHashes; + HashStringList expectedHashes = Owner->HashSums(); + for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs) { - string hashTag = expectedHash.HashType()+"-Hash"; - string hashSum = LookupTag(Message, hashTag.c_str()); - if(!hashSum.empty()) - RecivedHash = expectedHash.HashType() + ":" + hashSum; - if(_config->FindB("Debug::pkgAcquire::Auth", false) == true) - { - clog << "201 URI Done: " << Owner->DescURI() << endl - << "RecivedHash: " << RecivedHash << endl - << "ExpectedHash: " << expectedHash.toStr() - << endl << endl; - } + std::string const tagname = hs->HashType() + "-Hash"; + std::string const hashsum = LookupTag(Message, tagname.c_str()); + if (hashsum.empty() == false) + RecivedHashes.push_back(HashString(hs->HashType(), hashsum)); + } + + if(_config->FindB("Debug::pkgAcquire::Auth", false) == true) + { + std::clog << "201 URI Done: " << Owner->DescURI() << endl + << "RecivedHash:" << endl; + for (HashStringList::const_iterator hs = RecivedHashes.begin(); hs != RecivedHashes.end(); ++hs) + std::clog << "\t- " << hs->toStr() << std::endl; + std::clog << "ExpectedHash:" << endl; + for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs) + std::clog << "\t- " << hs->toStr() << std::endl; + std::clog << endl; } - Owner->Done(Message, ServerSize, RecivedHash.c_str(), Config); + Owner->Done(Message, ServerSize, RecivedHashes, Config); ItemDone(); - + // Log that we are done if (Log != 0) { @@ -525,6 +530,9 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item) Message.reserve(300); Message += "URI: " + Item->URI; Message += "\nFilename: " + Item->Owner->DestFile; + HashStringList const hsl = Item->Owner->HashSums(); + for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs) + Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue(); Message += Item->Owner->Custom600Headers(); Message += "\n\n"; diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index a187a00ae..57cbba169 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -31,6 +31,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <iomanip> #include <dirent.h> #include <sys/time.h> @@ -821,7 +822,9 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) // Compute the total number of bytes to fetch unsigned int Unknown = 0; unsigned int Count = 0; - for (pkgAcquire::ItemCIterator I = Owner->ItemsBegin(); I != Owner->ItemsEnd(); + bool UnfetchedReleaseFiles = false; + for (pkgAcquire::ItemCIterator I = Owner->ItemsBegin(); + I != Owner->ItemsEnd(); ++I, ++Count) { TotalItems++; @@ -832,6 +835,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) if ((*I)->Local == true) continue; + // see if the method tells us to expect more + TotalItems += (*I)->ExpectedAdditionalItems; + + // check if there are unfetched Release files + if ((*I)->Complete == false && (*I)->ExpectedAdditionalItems > 0) + UnfetchedReleaseFiles = true; + TotalBytes += (*I)->FileSize; if ((*I)->Complete == true) CurrentBytes += (*I)->FileSize; @@ -843,6 +853,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) unsigned long long ResumeSize = 0; for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0; I = Owner->WorkerStep(I)) + { if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false) { CurrentBytes += I->CurrentSize; @@ -853,6 +864,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) I->CurrentItem->Owner->Complete == false) TotalBytes += I->CurrentSize; } + } // Normalize the figures and account for unknown size downloads if (TotalBytes <= 0) @@ -863,6 +875,12 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) // Wha?! Is not supposed to happen. if (CurrentBytes > TotalBytes) CurrentBytes = TotalBytes; + + // debug + if (_config->FindB("Debug::acquire::progress", false) == true) + std::clog << " Bytes: " + << SizeToStr(CurrentBytes) << " / " << SizeToStr(TotalBytes) + << std::endl; // Compute the CPS struct timeval NewTime; @@ -883,6 +901,14 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) Time = NewTime; } + // calculate the percentage, if we have too little data assume 1% + if (TotalBytes > 0 && UnfetchedReleaseFiles) + Percent = 0; + else + // use both files and bytes because bytes can be unreliable + Percent = (0.8 * (CurrentBytes/float(TotalBytes)*100.0) + + 0.2 * (CurrentItems/float(TotalItems)*100.0)); + int fd = _config->FindI("APT::Status-Fd",-1); if(fd > 0) { @@ -900,13 +926,11 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) else snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems); - - // build the status str status << "dlstatus:" << i - << ":" << (CurrentBytes/float(TotalBytes)*100.0) - << ":" << msg - << endl; + << ":" << std::setprecision(3) << Percent + << ":" << msg + << endl; std::string const dlstatus = status.str(); FileFd::Write(fd, dlstatus.c_str(), dlstatus.size()); diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index ef16d8556..0113021b2 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -714,6 +714,10 @@ class pkgAcquireStatus /** \brief The number of items that have been successfully downloaded. */ unsigned long CurrentItems; + /** \brief The estimated percentage of the download (0-100) + */ + double Percent; + public: /** \brief If \b true, the download scheduler should call Pulse() diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 9982759c6..94b6bc246 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -540,7 +540,7 @@ std::string const Configuration::getBuildProfilesString() { return ""; std::vector<std::string>::const_iterator p = profiles.begin(); std::string list = *p; - for (; p != profiles.end(); ++p) + for (++p; p != profiles.end(); ++p) list.append(",").append(*p); return list; } diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 49d2855f5..d9b957c67 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -16,71 +16,14 @@ namespace APT { namespace CacheFilter { -#define PACKAGE_MATCHER_ABI_COMPAT 1 -#ifdef PACKAGE_MATCHER_ABI_COMPAT - -// PackageNameMatchesRegEx /*{{{*/ -class PackageNameMatchesRegEx { - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; - regex_t* pattern; -public: - PackageNameMatchesRegEx(std::string const &Pattern); - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::GrpIterator const &Grp); - ~PackageNameMatchesRegEx(); -}; - /*}}}*/ -// PackageNameMatchesFnmatch /*{{{*/ - class PackageNameMatchesFnmatch { - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; - const std::string Pattern; -public: - PackageNameMatchesFnmatch(std::string const &Pattern) - : Pattern(Pattern) {}; - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::GrpIterator const &Grp); - ~PackageNameMatchesFnmatch() {}; -}; - /*}}}*/ -// PackageArchitectureMatchesSpecification /*{{{*/ -/** \class PackageArchitectureMatchesSpecification - \brief matching against architecture specification strings - - The strings are of the format \<kernel\>-\<cpu\> where either component, - or the whole string, can be the wildcard "any" as defined in - debian-policy §11.1 "Architecture specification strings". - - Examples: i386, mipsel, linux-any, any-amd64, any */ -class PackageArchitectureMatchesSpecification { - std::string literal; - std::string complete; - bool isPattern; - /** \brief dpointer placeholder (for later in case we need it) */ - void *d; -public: - /** \brief matching against architecture specification strings - * - * @param pattern is the architecture specification string - * @param isPattern defines if the given \b pattern is a - * architecture specification pattern to match others against - * or if it is the fixed string and matched against patterns - */ - PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true); - bool operator() (char const * const &arch); - bool operator() (pkgCache::PkgIterator const &Pkg); - bool operator() (pkgCache::VerIterator const &Ver); - ~PackageArchitectureMatchesSpecification(); -}; - -#else - class PackageMatcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) { return false; }; - virtual bool operator() (pkgCache::GrpIterator const &Grp) { return false; }; - virtual bool operator() (pkgCache::VerIterator const &Ver) { return false; }; + virtual bool operator() (pkgCache::PkgIterator const &/*Pkg*/) { + return false; }; + virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) { + return false; }; + virtual bool operator() (pkgCache::VerIterator const &/*Ver*/) { + return false; }; virtual ~PackageMatcher() {}; }; @@ -139,7 +82,6 @@ public: virtual bool operator() (pkgCache::VerIterator const &Ver); virtual ~PackageArchitectureMatchesSpecification(); }; -#endif /*}}}*/ } } diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 2ed6a96da..5d7f28515 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -321,7 +321,8 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci if (FromGroup(pci, Cache, str, helper) == false && FromTask(pci, Cache, str, helper) == false && #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) - FromFnmatch(pci, Cache, str, helper) == false) + // FIXME: hm, hm, regexp/fnmatch incompatible? + FromFnmatch(pci, Cache, str, helper) == false && #endif FromRegEx(pci, Cache, str, helper) == false) { @@ -610,7 +611,7 @@ void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const /*pci*/, } #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) // canNotFindFnmatch - handle the case no package is found by a fnmatch /*{{{*/ -void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { + void CacheSetHelper::canNotFindFnmatch(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string pattern) { if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find any package by glob '%s'"), pattern.c_str()); } @@ -676,8 +677,8 @@ APT_CONST void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/ /*}}}*/ #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) // showFnmatchSelection /*{{{*/ -APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &pkg, - std::string const &pattern) { +APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &/*pkg*/, + std::string const &/*pattern*/) { } /*}}}*/ #endif diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 00f6ad0f9..fbe180f8e 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -254,7 +254,9 @@ string Configuration::FindDir(const char *Name,const char *Default) const // --------------------------------------------------------------------- /* Returns a vector of config values under the given item */ #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) -vector<string> Configuration::FindVector(const char *Name) const { return FindVector(Name, ""); } +vector<string> Configuration::FindVector(const char *Name) const { + return FindVector(Name, ""); +} #endif vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const { diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index c256139f4..6345c8a5d 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -84,12 +84,10 @@ class Configuration * \param Default list of values separated by commas */ std::vector<std::string> FindVector(const char *Name, std::string const &Default) const; std::vector<std::string> FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); }; -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) - std::vector<std::string> FindVector(const char *Name) const { return FindVector(Name, ""); }; -#else +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) std::vector<std::string> FindVector(const char *Name) const; #endif - std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str(), ""); }; + std::vector<std::string> FindVector(std::string const &Name="") const { return FindVector(Name.c_str(), ""); }; int FindI(const char *Name,int const &Default = 0) const; int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool const &Default = false) const; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index bfd958183..29450ada0 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -656,6 +656,22 @@ string flCombine(string Dir,string File) return Dir + '/' + File; } /*}}}*/ +// flAbsPath - Return the absolute path of the filename /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string flAbsPath(string File) +{ + char *p = realpath(File.c_str(), NULL); + if (p == NULL) + { + _error->Errno("realpath", "flAbsPath failed"); + return ""; + } + std::string AbsPath(p); + free(p); + return AbsPath; +} + /*}}}*/ // SetCloseExec - Set the close on exec flag /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -836,6 +852,27 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) } /*}}}*/ + +// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool StartsWithGPGClearTextSignature(string const &FileName) +{ + static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n"; + char buffer[strlen(SIGMSG)+1]; + FILE* gpg = fopen(FileName.c_str(), "r"); + if (gpg == NULL) + return false; + + char const * const test = fgets(buffer, sizeof(buffer), gpg); + fclose(gpg); + if (test == NULL || strcmp(buffer, SIGMSG) != 0) + return false; + + return true; +} + + class FileFdPrivate { /*{{{*/ public: #ifdef HAVE_ZLIB @@ -1798,7 +1835,8 @@ static bool StatFileFd(char const * const msg, int const iFd, std::string const // higher-level code will generate more meaningful messages, // even translated this would be meaningless for users return _error->Errno("fstat", "Unable to determine %s for fd %i", msg, iFd); - ispipe = S_ISFIFO(Buf.st_mode); + if (FileName.empty() == false) + ispipe = S_ISFIFO(Buf.st_mode); } // for compressor pipes st_size is undefined and at 'best' zero @@ -1912,7 +1950,6 @@ bool FileFd::Close() { if ((Flags & Compressed) != Compressed && iFd > 0 && close(iFd) != 0) Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); - if (d != NULL) { Res &= d->CloseDown(FileName); @@ -2039,6 +2076,31 @@ std::string GetTempDir() return string(tmpdir); } +FileFd* GetTempFile(std::string const &Prefix, bool ImmediateUnlink) +{ + char fn[512]; + FileFd *Fd = new FileFd(); + + std::string tempdir = GetTempDir(); + snprintf(fn, sizeof(fn), "%s/%s.XXXXXX", + tempdir.c_str(), Prefix.c_str()); + int fd = mkstemp(fn); + if(ImmediateUnlink) + unlink(fn); + if (fd < 0) + { + _error->Errno("GetTempFile",_("Unable to mkstemp %s"), fn); + return NULL; + } + if (!Fd->OpenDescriptor(fd, FileFd::WriteOnly, FileFd::None, true)) + { + _error->Errno("GetTempFile",_("Unable to write to %s"),fn); + return NULL; + } + + return Fd; +} + bool Rename(std::string From, std::string To) { if (rename(From.c_str(),To.c_str()) != 0) @@ -2049,3 +2111,58 @@ bool Rename(std::string From, std::string To) } return true; } + +bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode) +{ + int fd; + if (Mode != FileFd::ReadOnly && Mode != FileFd::WriteOnly) + return _error->Error("Popen supports ReadOnly (x)or WriteOnly mode only"); + + int Pipe[2] = {-1, -1}; + if(pipe(Pipe) != 0) + { + return _error->Errno("pipe", _("Failed to create subprocess IPC")); + return NULL; + } + std::set<int> keep_fds; + keep_fds.insert(Pipe[0]); + keep_fds.insert(Pipe[1]); + Child = ExecFork(keep_fds); + if(Child < 0) + return _error->Errno("fork", "Failed to fork"); + if(Child == 0) + { + if(Mode == FileFd::ReadOnly) + { + close(Pipe[0]); + fd = Pipe[1]; + } + else if(Mode == FileFd::WriteOnly) + { + close(Pipe[1]); + fd = Pipe[0]; + } + + if(Mode == FileFd::ReadOnly) + { + dup2(fd, 1); + dup2(fd, 2); + } else if(Mode == FileFd::WriteOnly) + dup2(fd, 0); + + execv(Args[0], (char**)Args); + _exit(100); + } + if(Mode == FileFd::ReadOnly) + { + close(Pipe[1]); + fd = Pipe[0]; + } else if(Mode == FileFd::WriteOnly) + { + close(Pipe[0]); + fd = Pipe[1]; + } + Fd.OpenDescriptor(fd, Mode, FileFd::None, true); + + return true; +} diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index cc1a98eae..0b4d94885 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -168,6 +168,8 @@ time_t GetModificationTime(std::string const &Path); bool Rename(std::string From, std::string To); std::string GetTempDir(); +FileFd* GetTempFile(std::string const &Prefix = "", + bool ImmediateUnlink = true); /** \brief Ensure the existence of the given Path * @@ -191,6 +193,9 @@ pid_t ExecFork(std::set<int> keep_fds); void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); +// check if the given file starts with a PGP cleartext signature +bool StartsWithGPGClearTextSignature(std::string const &FileName); + // File string manipulators std::string flNotDir(std::string File); std::string flNotFile(std::string File); @@ -198,7 +203,23 @@ std::string flNoLink(std::string File); std::string flExtension(std::string File); std::string flCombine(std::string Dir,std::string File); +/** \brief Takes a file path and returns the absolute path + */ +std::string flAbsPath(std::string File); + // simple c++ glob std::vector<std::string> Glob(std::string const &pattern, int flags=0); +/** \brief Popen() implementation that execv() instead of using a shell + * + * \param Args the execv style command to run + * \param FileFd is a referenz to the FileFd to use for input or output + * \param Child a reference to the integer that stores the child pid + * Note that you must call ExecWait() or similar to cleanup + * \param Mode is either FileFd::ReadOnly or FileFd::WriteOnly + * \return true on success, false on failure with _error set + */ +bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode); + + #endif diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 15f83615d..199e395f6 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -27,7 +27,7 @@ #include <iostream> /*}}}*/ -const char* HashString::_SupportedHashes[] = +const char * HashString::_SupportedHashes[] = { "SHA512", "SHA256", "SHA1", "MD5Sum", NULL }; @@ -42,11 +42,16 @@ HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Ha HashString::HashString(std::string StringedHash) /*{{{*/ { - // legacy: md5sum without "MD5Sum:" prefix - if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32) + if (StringedHash.find(":") == std::string::npos) { - Type = "MD5Sum"; - Hash = StringedHash; + // legacy: md5sum without "MD5Sum:" prefix + if (StringedHash.size() == 32) + { + Type = "MD5Sum"; + Hash = StringedHash; + } + if(_config->FindB("Debug::Hashes",false) == true) + std::clog << "HashString(string): invalid StringedHash " << StringedHash << std::endl; return; } std::string::size_type pos = StringedHash.find(":"); @@ -82,25 +87,25 @@ std::string HashString::GetHashForFile(std::string filename) const /*{{{*/ std::string fileHash; FileFd Fd(filename, FileFd::ReadOnly); - if(Type == "MD5Sum") + if(strcasecmp(Type.c_str(), "MD5Sum") == 0) { MD5Summation MD5; MD5.AddFD(Fd); fileHash = (std::string)MD5.Result(); } - else if (Type == "SHA1") + else if (strcasecmp(Type.c_str(), "SHA1") == 0) { SHA1Summation SHA1; SHA1.AddFD(Fd); fileHash = (std::string)SHA1.Result(); } - else if (Type == "SHA256") + else if (strcasecmp(Type.c_str(), "SHA256") == 0) { SHA256Summation SHA256; SHA256.AddFD(Fd); fileHash = (std::string)SHA256.Result(); } - else if (Type == "SHA512") + else if (strcasecmp(Type.c_str(), "SHA512") == 0) { SHA512Summation SHA512; SHA512.AddFD(Fd); @@ -111,26 +116,147 @@ std::string HashString::GetHashForFile(std::string filename) const /*{{{*/ return fileHash; } /*}}}*/ -const char** HashString::SupportedHashes() +const char** HashString::SupportedHashes() /*{{{*/ { return _SupportedHashes; } - -APT_PURE bool HashString::empty() const + /*}}}*/ +APT_PURE bool HashString::empty() const /*{{{*/ { return (Type.empty() || Hash.empty()); } + /*}}}*/ +std::string HashString::toStr() const /*{{{*/ +{ + return Type + ":" + Hash; +} + /*}}}*/ +APT_PURE bool HashString::operator==(HashString const &other) const /*{{{*/ +{ + return (strcasecmp(Type.c_str(), other.Type.c_str()) == 0 && Hash == other.Hash); +} +APT_PURE bool HashString::operator!=(HashString const &other) const +{ + return !(*this == other); +} + /*}}}*/ + +bool HashStringList::usable() const /*{{{*/ +{ + if (empty() == true) + return false; + std::string const forcedType = _config->Find("Acquire::ForceHash", ""); + if (forcedType.empty() == true) + return true; + return find(forcedType) != NULL; +} + /*}}}*/ +HashString const * HashStringList::find(char const * const type) const /*{{{*/ +{ + if (type == NULL || type[0] == '\0') + { + std::string const forcedType = _config->Find("Acquire::ForceHash", ""); + if (forcedType.empty() == false) + return find(forcedType.c_str()); + for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t) + for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs) + if (strcasecmp(hs->HashType().c_str(), *t) == 0) + return &*hs; + return NULL; + } + for (std::vector<HashString>::const_iterator hs = list.begin(); hs != list.end(); ++hs) + if (strcasecmp(hs->HashType().c_str(), type) == 0) + return &*hs; + return NULL; +} + /*}}}*/ +bool HashStringList::supported(char const * const type) /*{{{*/ +{ + for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t) + if (strcasecmp(*t, type) == 0) + return true; + return false; +} + /*}}}*/ +bool HashStringList::push_back(const HashString &hashString) /*{{{*/ +{ + if (hashString.HashType().empty() == true || + hashString.HashValue().empty() == true || + supported(hashString.HashType().c_str()) == false) + return false; + + // ensure that each type is added only once + HashString const * const hs = find(hashString.HashType().c_str()); + if (hs != NULL) + return *hs == hashString; -std::string HashString::toStr() const + list.push_back(hashString); + return true; +} + /*}}}*/ +bool HashStringList::VerifyFile(std::string filename) const /*{{{*/ { - return Type + std::string(":") + Hash; + if (list.empty() == true) + return false; + HashString const * const hs = find(NULL); + if (hs == NULL || hs->VerifyFile(filename) == false) + return false; + return true; } + /*}}}*/ +bool HashStringList::operator==(HashStringList const &other) const /*{{{*/ +{ + std::string const forcedType = _config->Find("Acquire::ForceHash", ""); + if (forcedType.empty() == false) + { + HashString const * const hs = other.find(forcedType); + HashString const * const ohs = other.find(forcedType); + if (hs == NULL || ohs == NULL) + return false; + return hs == ohs; + } + short matches = 0; + for (const_iterator hs = begin(); hs != end(); ++hs) + { + HashString const * const ohs = other.find(hs->HashType()); + if (ohs == NULL) + continue; + if (*hs != *ohs) + return false; + ++matches; + } + if (matches == 0) + return false; + return true; +} +bool HashStringList::operator!=(HashStringList const &other) const +{ + return !(*this == other); +} + /*}}}*/ -// Hashes::AddFD - Add the contents of the FD /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5, - bool const addSHA1, bool const addSHA256, bool const addSHA512) +// Hashes::Add* - Add the contents of data or FD /*{{{*/ +bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, unsigned int const Hashes) +{ + bool Res = true; +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + if ((Hashes & MD5SUM) == MD5SUM) + Res &= MD5.Add(Data, Size); + if ((Hashes & SHA1SUM) == SHA1SUM) + Res &= SHA1.Add(Data, Size); + if ((Hashes & SHA256SUM) == SHA256SUM) + Res &= SHA256.Add(Data, Size); + if ((Hashes & SHA512SUM) == SHA512SUM) + Res &= SHA512.Add(Data, Size); +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + return Res; +} +bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes) { unsigned char Buf[64*64]; bool const ToEOF = (Size == UntilEOF); @@ -144,19 +270,12 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5, if (ToEOF && Res == 0) // EOF break; Size -= Res; - if (addMD5 == true) - MD5.Add(Buf,Res); - if (addSHA1 == true) - SHA1.Add(Buf,Res); - if (addSHA256 == true) - SHA256.Add(Buf,Res); - if (addSHA512 == true) - SHA512.Add(Buf,Res); + if (Add(Buf, Res, Hashes) == false) + return false; } return true; } -bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, bool const addMD5, - bool const addSHA1, bool const addSHA256, bool const addSHA512) +bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes) { unsigned char Buf[64*64]; bool const ToEOF = (Size == 0); @@ -175,15 +294,35 @@ bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, bool const addMD5, else if (a == 0) // EOF break; Size -= a; - if (addMD5 == true) - MD5.Add(Buf, a); - if (addSHA1 == true) - SHA1.Add(Buf, a); - if (addSHA256 == true) - SHA256.Add(Buf, a); - if (addSHA512 == true) - SHA512.Add(Buf, a); + if (Add(Buf, a, Hashes) == false) + return false; } return true; } /*}}}*/ +HashStringList Hashes::GetHashStringList() +{ + HashStringList hashes; +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + hashes.push_back(HashString("MD5Sum", MD5.Result().Value())); + hashes.push_back(HashString("SHA1", SHA1.Result().Value())); + hashes.push_back(HashString("SHA256", SHA256.Result().Value())); + hashes.push_back(HashString("SHA512", SHA512.Result().Value())); +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + return hashes; +} +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#endif +Hashes::Hashes() {} +Hashes::~Hashes() {} +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 7a62f8a8f..caeba006d 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -17,6 +17,7 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/sha2.h> +#include <apt-pkg/macros.h> #include <cstring> #include <string> @@ -41,7 +42,7 @@ class HashString protected: std::string Type; std::string Hash; - static const char* _SupportedHashes[10]; + static const char * _SupportedHashes[10]; // internal helper std::string GetHashForFile(std::string filename) const; @@ -52,7 +53,8 @@ class HashString HashString(); // get hash type used - std::string HashType() { return Type; }; + std::string HashType() const { return Type; }; + std::string HashValue() const { return Hash; }; // verify the given filename against the currently loaded hash bool VerifyFile(std::string filename) const; @@ -64,37 +66,160 @@ class HashString // helper std::string toStr() const; // convert to str as "type:hash" bool empty() const; + bool operator==(HashString const &other) const; + bool operator!=(HashString const &other) const; // return the list of hashes we support static APT_CONST const char** SupportedHashes(); }; +class HashStringList +{ + public: + /** find best hash if no specific one is requested + * + * @param type of the checksum to return, can be \b NULL + * @return If type is \b NULL (or the empty string) it will + * return the 'best' hash; otherwise the hash which was + * specifically requested. If no hash is found \b NULL will be returned. + */ + HashString const * find(char const * const type) const; + HashString const * find(std::string const &type) const { return find(type.c_str()); } + /** check if the given hash type is supported + * + * @param type to check + * @return true if supported, otherwise false + */ + static APT_PURE bool supported(char const * const type); + /** add the given #HashString to the list + * + * @param hashString to add + * @return true if the hash is added because it is supported and + * not already a different hash of the same type included, otherwise false + */ + bool push_back(const HashString &hashString); + /** @return size of the list of HashStrings */ + size_t size() const { return list.size(); } + + /** take the 'best' hash and verify file with it + * + * @param filename to verify + * @return true if the file matches the hashsum, otherwise false + */ + bool VerifyFile(std::string filename) const; + + /** is the list empty ? + * + * @return \b true if the list is empty, otherwise \b false + */ + bool empty() const { return list.empty(); } + + /** has the list at least one good entry + * + * similar to #empty, but handles forced hashes. + * + * @return if no hash is forced, same result as #empty, + * if one is forced \b true if this has is available, \b false otherwise + */ + bool usable() const; + + typedef std::vector<HashString>::const_iterator const_iterator; + + /** iterator to the first element */ + const_iterator begin() const { return list.begin(); } + + /** iterator to the end element */ + const_iterator end() const { return list.end(); } + + /** start fresh with a clear list */ + void clear() { list.clear(); } + + /** compare two HashStringList for similarity. + * + * Two lists are similar if at least one hashtype is in both lists + * and the hashsum matches. All hashes are checked by default, + * if one doesn't match false is returned regardless of how many + * matched before. If a hash is forced, only this hash is compared, + * all others are ignored. + */ + bool operator==(HashStringList const &other) const; + bool operator!=(HashStringList const &other) const; + + HashStringList() {} + + // simplifying API-compatibility constructors + HashStringList(std::string const &hash) { + if (hash.empty() == false) + list.push_back(HashString(hash)); + } + HashStringList(char const * const hash) { + if (hash != NULL && hash[0] != '\0') + list.push_back(HashString(hash)); + } + + private: + std::vector<HashString> list; +}; + class Hashes { + /** \brief dpointer placeholder */ + void *d; + public: + /* those will disappear in the future as it is hard to add new ones this way. + * Use Add* to build the results and get them via GetHashStringList() instead */ + APT_DEPRECATED MD5Summation MD5; + APT_DEPRECATED SHA1Summation SHA1; + APT_DEPRECATED SHA256Summation SHA256; + APT_DEPRECATED SHA512Summation SHA512; - MD5Summation MD5; - SHA1Summation SHA1; - SHA256Summation SHA256; - SHA512Summation SHA512; - static const int UntilEOF = 0; - inline bool Add(const unsigned char *Data,unsigned long long Size) + bool Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes = ~0); + inline bool Add(const char * const Data) + {return Add((unsigned char const * const)Data,strlen(Data));}; + inline bool Add(const unsigned char * const Beg,const unsigned char * const End) + {return Add(Beg,End-Beg);}; + + enum SupportedHashes { MD5SUM = (1 << 0), SHA1SUM = (1 << 1), SHA256SUM = (1 << 2), + SHA512SUM = (1 << 3) }; + bool AddFD(int const Fd,unsigned long long Size = 0, unsigned int const Hashes = ~0); + bool AddFD(FileFd &Fd,unsigned long long Size = 0, unsigned int const Hashes = ~0); + + HashStringList GetHashStringList(); + +#if __GNUC__ >= 4 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + Hashes(); + virtual ~Hashes(); +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + + private: + APT_HIDDEN APT_CONST inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512) { - return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size); + unsigned int Hashes = ~0; + if (addMD5 == false) Hashes &= ~MD5SUM; + if (addSHA1 == false) Hashes &= ~SHA1SUM; + if (addSHA256 == false) Hashes &= ~SHA256SUM; + if (addSHA512 == false) Hashes &= ~SHA512SUM; + return Hashes; + } + + public: + APT_DEPRECATED bool AddFD(int const Fd, unsigned long long Size, bool const addMD5, + bool const addSHA1, bool const addSHA256, bool const addSHA512) { + return AddFD(Fd, Size, boolsToFlag(addMD5, addSHA1, addSHA256, addSHA512)); + }; + + APT_DEPRECATED bool AddFD(FileFd &Fd, unsigned long long Size, bool const addMD5, + bool const addSHA1, bool const addSHA256, bool const addSHA512) { + return AddFD(Fd, Size, boolsToFlag(addMD5, addSHA1, addSHA256, addSHA512)); }; - inline bool Add(const char *Data) {return Add((unsigned char const *)Data,strlen(Data));}; - inline bool AddFD(int const Fd,unsigned long long Size = 0) - { return AddFD(Fd, Size, true, true, true, true); }; - bool AddFD(int const Fd, unsigned long long Size, bool const addMD5, - bool const addSHA1, bool const addSHA256, bool const addSHA512); - inline bool AddFD(FileFd &Fd,unsigned long long Size = 0) - { return AddFD(Fd, Size, true, true, true, true); }; - bool AddFD(FileFd &Fd, unsigned long long Size, bool const addMD5, - bool const addSHA1, bool const addSHA256, bool const addSHA512); - inline bool Add(const unsigned char *Beg,const unsigned char *End) - {return Add(Beg,End-Beg);}; }; #endif diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 2d6448e5e..b268ce24c 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -138,7 +138,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 12 +#define APT_PKG_MINOR 13 #define APT_PKG_RELEASE 0 #endif diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index feaed67c8..1e3778f45 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -152,18 +152,6 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw return retcode; } -// for some unknown reason this method is exported so keep a compatible interface for now … -int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL) -{ - std::string login_string, password_string; - int const ret = parsenetrc_string(host, login_string, password_string, netrcfile); - if (ret < 0) - return ret; - strncpy(login, login_string.c_str(), LOGINSIZE - 1); - strncpy(password, password_string.c_str(), PASSWORDSIZE - 1); - return ret; -} - void maybe_add_auth (URI &Uri, string NetRCFile) { diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index dbeb45386..b5b56f5d4 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -27,9 +27,5 @@ class URI; -// FIXME: kill this export on the next ABI break - strongly doubt its in use anyway -// outside of the apt itself, its really a internal interface -APT_DEPRECATED int parsenetrc (char *host, char *login, char *password, char *filename); - void maybe_add_auth (URI &Uri, std::string NetRCFile); #endif diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index a0dd15cd8..3bdc551b4 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -30,6 +30,7 @@ #include <apt-pkg/pkgcachegen.h> #include <apt-pkg/pkgrecords.h> #include <apt-pkg/srcrecords.h> +#include <apt-pkg/sptr.h> #include <stdio.h> #include <iostream> @@ -667,6 +668,133 @@ APT_CONST bool debStatusIndex::Exists() const } /*}}}*/ +// debDebPkgFile - Single .deb file /*{{{*/ +// --------------------------------------------------------------------- +debDebPkgFileIndex::debDebPkgFileIndex(std::string DebFile) + : pkgIndexFile(true), DebFile(DebFile) +{ + DebFileFullPath = flAbsPath(DebFile); +} + +std::string debDebPkgFileIndex::ArchiveURI(std::string /*File*/) const +{ + return "file:" + DebFileFullPath; +} + +bool debDebPkgFileIndex::Exists() const +{ + return FileExists(DebFile); +} +bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const +{ + if(Prog) + Prog->SubProgress(0, "Reading deb file"); + + // get the control data out of the deb file vid dpkg -I + // ... can I haz libdpkg? + std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg"); + const char *Args[5] = {dpkg.c_str(), + "-I", + DebFile.c_str(), + "control", + NULL}; + FileFd PipeFd; + pid_t Child; + if(Popen(Args, PipeFd, Child, FileFd::ReadOnly) == false) + return _error->Error("Popen failed"); + // FIXME: static buffer + char buf[8*1024]; + unsigned long long n = 0; + if(PipeFd.Read(buf, sizeof(buf)-1, &n) == false) + return _error->Errno("read", "Failed to read dpkg pipe"); + ExecWait(Child, "Popen"); + + // now write the control data to a tempfile + SPtr<FileFd> DebControl = GetTempFile("deb-file-" + DebFile); + if(DebControl == NULL) + return false; + DebControl->Write(buf, n); + // append size of the file + FileFd Fd(DebFile, FileFd::ReadOnly); + string Size; + strprintf(Size, "Size: %llu\n", Fd.Size()); + DebControl->Write(Size.c_str(), Size.size()); + // and rewind for the listparser + DebControl->Seek(0); + + // and give it to the list parser + debDebFileParser Parser(DebControl, DebFile); + if(Gen.SelectFile(DebFile, "local", *this) == false) + return _error->Error("Problem with SelectFile %s", DebFile.c_str()); + + pkgCache::PkgFileIterator File = Gen.GetCurFile(); + File->Size = DebControl->Size(); + File->mtime = DebControl->ModificationTime(); + + if (Gen.MergeList(Parser) == false) + return _error->Error("Problem with MergeLister for %s", DebFile.c_str()); + + return true; +} +pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const +{ + // FIXME: we could simply always return pkgCache::PkgFileIterator(Cache); + // to indicate its never in the cache which will force a Merge() + pkgCache::PkgFileIterator File = Cache.FileBegin(); + for (; File.end() == false; ++File) + { + if (File.FileName() == NULL || DebFile != File.FileName()) + continue; + + return File; + } + + return File; +} +unsigned long debDebPkgFileIndex::Size() const +{ + struct stat buf; + if(stat(DebFile.c_str(), &buf) != 0) + return 0; + return buf.st_size; +} + /*}}}*/ + +// debDscFileIndex stuff +debDscFileIndex::debDscFileIndex(std::string &DscFile) + : pkgIndexFile(true), DscFile(DscFile) +{ +} + +bool debDscFileIndex::Exists() const +{ + return FileExists(DscFile); +} + +unsigned long debDscFileIndex::Size() const +{ + struct stat buf; + if(stat(DscFile.c_str(), &buf) == 0) + return buf.st_size; + return 0; +} + +// DscFileIndex::CreateSrcParser - Get a parser for the .dsc file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgSrcRecords::Parser *debDscFileIndex::CreateSrcParser() const +{ + if (!FileExists(DscFile)) + return NULL; + + return new debDscRecordParser(DscFile,this); +} + /*}}}*/ + + + + +// --------------------------------------------------------------------- // Index File types for Debian /*{{{*/ class debIFTypeSrc : public pkgIndexFile::Type { @@ -699,10 +827,42 @@ class debIFTypeStatus : public pkgIndexFile::Type }; debIFTypeStatus() {Label = "Debian dpkg status file";}; }; +class debIFTypeDebPkgFile : public pkgIndexFile::Type +{ + public: + virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const + { + return new debDebFileRecordParser(File.FileName(),*File.Cache()); + }; + debIFTypeDebPkgFile() {Label = "deb Package file";}; +}; +class debIFTypeDscFile : public pkgIndexFile::Type +{ + public: + virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string DscFile) const + { + return new debDscRecordParser(DscFile, NULL); + }; + debIFTypeDscFile() {Label = "dsc File Source Index";}; +}; +class debIFTypeDebianSourceDir : public pkgIndexFile::Type +{ + public: + virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string SourceDir) const + { + return new debDscRecordParser(SourceDir + string("/debian/control"), NULL); + }; + debIFTypeDebianSourceDir() {Label = "debian/control File Source Index";}; +}; + static debIFTypeSrc _apt_Src; static debIFTypePkg _apt_Pkg; static debIFTypeTrans _apt_Trans; static debIFTypeStatus _apt_Status; +static debIFTypeDebPkgFile _apt_DebPkgFile; +// file based pseudo indexes +static debIFTypeDscFile _apt_DscFile; +static debIFTypeDebianSourceDir _apt_DebianSourceDir; const pkgIndexFile::Type *debSourcesIndex::GetType() const { @@ -720,5 +880,16 @@ const pkgIndexFile::Type *debStatusIndex::GetType() const { return &_apt_Status; } - +const pkgIndexFile::Type *debDebPkgFileIndex::GetType() const +{ + return &_apt_DebPkgFile; +} +const pkgIndexFile::Type *debDscFileIndex::GetType() const +{ + return &_apt_DscFile; +} +const pkgIndexFile::Type *debDebianSourceDirIndex::GetType() const +{ + return &_apt_DebianSourceDir; +} /*}}}*/ diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 017c69a0a..18322dc1b 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -164,4 +164,57 @@ class debSourcesIndex : public pkgIndexFile virtual ~debSourcesIndex() {}; }; +class debDebPkgFileIndex : public pkgIndexFile +{ + private: + void *d; + std::string DebFile; + std::string DebFileFullPath; + + public: + virtual const Type *GetType() const APT_CONST; + + virtual std::string Describe(bool /*Short*/) const { + return DebFile; + } + + // Interface for the Cache Generator + virtual bool Exists() const; + virtual bool HasPackages() const { + return true; + }; + virtual unsigned long Size() const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; + virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; + + // Interface for acquire + virtual std::string ArchiveURI(std::string /*File*/) const; + + debDebPkgFileIndex(std::string DebFile); + virtual ~debDebPkgFileIndex() {}; +}; + +class debDscFileIndex : public pkgIndexFile +{ + private: + std::string DscFile; + public: + virtual const Type *GetType() const APT_CONST; + virtual pkgSrcRecords::Parser *CreateSrcParser() const; + virtual bool Exists() const; + virtual bool HasPackages() const {return false;}; + virtual unsigned long Size() const; + virtual std::string Describe(bool /*Short*/) const { + return DscFile; + }; + + debDscFileIndex(std::string &DscFile); + virtual ~debDscFileIndex() {}; +}; + +class debDebianSourceDirIndex : public debDscFileIndex +{ + virtual const Type *GetType() const APT_CONST; +}; + #endif diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index a1bcfb710..40d332196 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -194,35 +194,31 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) /* This is to return the string describing the package in debian form. If this returns the blank string then the entry is assumed to only describe package properties */ -string debListParser::Description() +string debListParser::Description(std::string const &lang) { - string const lang = DescriptionLanguage(); if (lang.empty()) return Section.FindS("Description"); else return Section.FindS(string("Description-").append(lang).c_str()); } - /*}}}*/ -// ListParser::DescriptionLanguage - Return the description lang string /*{{{*/ -// --------------------------------------------------------------------- -/* This is to return the string describing the language of - description. If this returns the blank string then the entry is - assumed to describe original description. */ -string debListParser::DescriptionLanguage() + /*}}}*/ +// ListParser::AvailableDescriptionLanguages /*{{{*/ +std::vector<std::string> debListParser::AvailableDescriptionLanguages() { - if (Section.FindS("Description").empty() == false) - return ""; - - std::vector<string> const lang = APT::Configuration::getLanguages(true); - for (std::vector<string>::const_iterator l = lang.begin(); - l != lang.end(); ++l) - if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false) - return *l; - - return ""; + std::vector<std::string> const understood = APT::Configuration::getLanguages(); + std::vector<std::string> avail; + if (Section.Exists("Description") == true) + avail.push_back(""); + for (std::vector<std::string>::const_iterator lang = understood.begin(); lang != understood.end(); ++lang) + { + std::string const tagname = "Description-" + *lang; + if (Section.Exists(tagname.c_str()) == true) + avail.push_back(*lang); + } + return avail; } - /*}}}*/ -// ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/ + /*}}}*/ +// ListParser::Description_md5 - Return the description_md5 MD5SumValue /*{{{*/ // --------------------------------------------------------------------- /* This is to return the md5 string to allow the check if it is the right description. If no Description-md5 is found in the section it will be @@ -233,7 +229,7 @@ MD5SumValue debListParser::Description_md5() string const value = Section.FindS("Description-md5"); if (value.empty() == true) { - std::string const desc = Description() + "\n"; + std::string const desc = Description("") + "\n"; if (desc == "\n") return MD5SumValue(); @@ -959,3 +955,23 @@ bool debListParser::SameVersion(unsigned short const Hash, /*{{{*/ } /*}}}*/ #endif + + +debDebFileParser::debDebFileParser(FileFd *File, std::string const &DebFile) + : debListParser(File, ""), DebFile(DebFile) +{ +} + +bool debDebFileParser::UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) +{ + bool res = debListParser::UsePackage(Pkg, Ver); + // we use the full file path as a provides so that the file is found + // by its name + if(NewProvidesAllArch(Ver, DebFile, Ver.VerStr()) == false) + return false; + return res; +} + + + diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 3b6963211..56a83b36e 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -56,7 +56,8 @@ class debListParser : public pkgCacheGenerator::ListParser bool ParseProvides(pkgCache::VerIterator &Ver); bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version); static bool GrabWord(std::string Word,WordList *List,unsigned char &Out); - + APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors); + public: static unsigned char GetPrio(std::string Str); @@ -67,8 +68,8 @@ class debListParser : public pkgCacheGenerator::ListParser virtual bool ArchitectureAll(); virtual std::string Version(); virtual bool NewVersion(pkgCache::VerIterator &Ver); - virtual std::string Description(); - virtual std::string DescriptionLanguage(); + virtual std::string Description(std::string const &lang); + virtual std::vector<std::string> AvailableDescriptionLanguages(); virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) @@ -101,9 +102,17 @@ class debListParser : public pkgCacheGenerator::ListParser debListParser(FileFd *File, std::string const &Arch = ""); virtual ~debListParser() {}; +}; - private: - APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors); +class debDebFileParser : public debListParser +{ + private: + std::string DebFile; + + public: + debDebFileParser(FileFd *File, std::string const &DebFile); + virtual bool UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver); }; class debTranslationsParser : public debListParser diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7447881d0..73010e867 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -258,7 +258,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const vector <IndexTarget *> *targets = ComputeIndexTargets(); for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) { new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, HashString()); + (*Target)->ShortDesc, HashStringList()); } delete targets; @@ -471,6 +471,15 @@ class debSLTypeDebian : public pkgSourceList::Type } }; +debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile) + : metaIndex(DebFile, "local-uri", "deb-dist"), DebFile(DebFile) +{ + DebIndex = new debDebPkgFileIndex(DebFile); + Indexes = new vector<pkgIndexFile *>(); + Indexes->push_back(DebIndex); +} + + class debSLTypeDeb : public debSLTypeDebian { public: @@ -507,5 +516,25 @@ class debSLTypeDebSrc : public debSLTypeDebian } }; +class debSLTypeDebFile : public pkgSourceList::Type +{ + public: + + bool CreateItem(vector<metaIndex *> &List, string const &URI, + string const &/*Dist*/, string const &/*Section*/, + std::map<string, string> const &/*Options*/) const + { + metaIndex *mi = new debDebFileMetaIndex(URI); + List.push_back(mi); + return true; + } + + debSLTypeDebFile() + { + Name = "deb-file"; + Label = "Debian Deb File"; + } +}; debSLTypeDeb _apt_DebType; debSLTypeDebSrc _apt_DebSrcType; +debSLTypeDebFile _apt_DebFileType; diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index bbeba1598..7091c198f 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -18,6 +18,7 @@ class pkgAcquire; class pkgIndexFile; +class debDebPkgFileIndex; class IndexTarget; class debReleaseIndex : public metaIndex { @@ -72,4 +73,27 @@ class debReleaseIndex : public metaIndex { void PushSectionEntry(const debSectionEntry *Entry); }; +class debDebFileMetaIndex : public metaIndex +{ + private: + std::string DebFile; + debDebPkgFileIndex *DebIndex; + public: + virtual std::string ArchiveURI(std::string const& /*File*/) const { + return DebFile; + } + virtual bool GetIndexes(pkgAcquire* /*Owner*/, const bool& /*GetAll=false*/) const { + return true; + } + virtual std::vector<pkgIndexFile *> *GetIndexFiles() { + return Indexes; + } + virtual bool IsTrusted() const { + return true; + } + debDebFileMetaIndex(std::string const &DebFile); + virtual ~debDebFileMetaIndex() {}; + +}; + #endif diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 6063db5a8..d2c04d8b2 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -73,36 +73,17 @@ string debRecordParser::Homepage() return Section.FindS("Homepage"); } /*}}}*/ -// RecordParser::MD5Hash - Return the archive hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string debRecordParser::MD5Hash() -{ - return Section.FindS("MD5Sum"); -} - /*}}}*/ -// RecordParser::SHA1Hash - Return the archive hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string debRecordParser::SHA1Hash() -{ - return Section.FindS("SHA1"); -} - /*}}}*/ -// RecordParser::SHA256Hash - Return the archive hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string debRecordParser::SHA256Hash() -{ - return Section.FindS("SHA256"); -} - /*}}}*/ -// RecordParser::SHA512Hash - Return the archive hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string debRecordParser::SHA512Hash() +// RecordParser::Hashes - return the available archive hashes /*{{{*/ +HashStringList debRecordParser::Hashes() const { - return Section.FindS("SHA512"); + HashStringList hashes; + for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type) + { + std::string const hash = Section.FindS(*type); + if (hash.empty() == false) + hashes.push_back(HashString(*type, hash)); + } + return hashes; } /*}}}*/ // RecordParser::Maintainer - Return the maintainer email /*{{{*/ @@ -125,10 +106,12 @@ string debRecordParser::RecordField(const char *fieldName) // RecordParser::ShortDesc - Return a 1 line description /*{{{*/ // --------------------------------------------------------------------- /* */ -string debRecordParser::ShortDesc() +string debRecordParser::ShortDesc(std::string const &lang) { - string Res = LongDesc(); - string::size_type Pos = Res.find('\n'); + string const Res = LongDesc(lang); + if (Res.empty() == true) + return ""; + string::size_type const Pos = Res.find('\n'); if (Pos == string::npos) return Res; return string(Res,0,Pos); @@ -137,26 +120,44 @@ string debRecordParser::ShortDesc() // RecordParser::LongDesc - Return a longer description /*{{{*/ // --------------------------------------------------------------------- /* */ -string debRecordParser::LongDesc() -{ - string orig, dest; +string debRecordParser::LongDesc(std::string const &lang) +{ + string orig; + if (lang.empty() == true) + { + std::vector<string> const lang = APT::Configuration::getLanguages(); + for (std::vector<string>::const_iterator l = lang.begin(); + l != lang.end(); ++l) + { + std::string const tagname = "Description-" + *l; + orig = Section.FindS(tagname.c_str()); + if (orig.empty() == false) + break; + else if (*l == "en") + { + orig = Section.FindS("Description"); + if (orig.empty() == false) + break; + } + } + if (orig.empty() == true) + orig = Section.FindS("Description"); + } + else + { + std::string const tagname = "Description-" + lang; + orig = Section.FindS(tagname.c_str()); + if (orig.empty() == true && lang == "en") + orig = Section.FindS("Description"); + } - if (!Section.FindS("Description").empty()) - orig = Section.FindS("Description").c_str(); - else - { - std::vector<string> const lang = APT::Configuration::getLanguages(); - for (std::vector<string>::const_iterator l = lang.begin(); - orig.empty() && l != lang.end(); ++l) - orig = Section.FindS(string("Description-").append(*l).c_str()); - } + char const * const codeset = nl_langinfo(CODESET); + if (strcmp(codeset,"UTF-8") != 0) { + string dest; + UTF8ToCodeset(codeset, orig, &dest); + return dest; + } - char const * const codeset = nl_langinfo(CODESET); - if (strcmp(codeset,"UTF-8") != 0) { - UTF8ToCodeset(codeset, orig, &dest); - orig = dest; - } - return orig; } /*}}}*/ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index bdac6c90b..2bd3f3c8f 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -29,31 +29,28 @@ class debRecordParser : public pkgRecords::Parser { /** \brief dpointer placeholder (for later in case we need it) */ void *d; - + + protected: FileFd File; pkgTagFile Tags; pkgTagSection Section; - protected: - virtual bool Jump(pkgCache::VerFileIterator const &Ver); virtual bool Jump(pkgCache::DescFileIterator const &Desc); - public: + public: // These refer to the archive file for the Version virtual std::string FileName(); - virtual std::string MD5Hash(); - virtual std::string SHA1Hash(); - virtual std::string SHA256Hash(); - virtual std::string SHA512Hash(); virtual std::string SourcePkg(); virtual std::string SourceVer(); - + + virtual HashStringList Hashes() const; + // These are some general stats about the package virtual std::string Maintainer(); - virtual std::string ShortDesc(); - virtual std::string LongDesc(); + virtual std::string ShortDesc(std::string const &lang); + virtual std::string LongDesc(std::string const &lang); virtual std::string Name(); virtual std::string Homepage(); @@ -66,4 +63,15 @@ class debRecordParser : public pkgRecords::Parser virtual ~debRecordParser() {}; }; +// custom record parser that reads deb files directly +class debDebFileRecordParser : public debRecordParser +{ + public: + virtual std::string FileName() { + return File.Name(); + } + debDebFileRecordParser(std::string FileName,pkgCache &Cache) + : debRecordParser(FileName, Cache) {}; +}; + #endif diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index a8a092a16..97f43aca2 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -18,6 +18,8 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/srcrecords.h> #include <apt-pkg/tagfile.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/gpgv.h> #include <ctype.h> #include <stdlib.h> @@ -122,10 +124,6 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List) { List.erase(List.begin(),List.end()); - - string Files = Sect.FindS("Files"); - if (Files.empty() == true) - return false; // Stash the / terminated directory prefix string Base = Sect.FindS("Directory"); @@ -134,51 +132,105 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List) std::vector<std::string> const compExts = APT::Configuration::getCompressorExtensions(); - // Iterate over the entire list grabbing each triplet - const char *C = Files.c_str(); - while (*C != 0) - { - pkgSrcRecords::File F; - string Size; - - // Parse each of the elements - if (ParseQuoteWord(C,F.MD5Hash) == false || - ParseQuoteWord(C,Size) == false || - ParseQuoteWord(C,F.Path) == false) - return _error->Error("Error parsing file record"); - - // Parse the size and append the directory - F.Size = atoi(Size.c_str()); - F.Path = Base + F.Path; - - // Try to guess what sort of file it is we are getting. - string::size_type Pos = F.Path.length()-1; - while (1) + for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type) + { + // derive field from checksum type + std::string checksumField("Checksums-"); + if (strcmp(*type, "MD5Sum") == 0) + checksumField = "Files"; // historic name for MD5 checksums + else + checksumField.append(*type); + + string const Files = Sect.FindS(checksumField.c_str()); + if (Files.empty() == true) + continue; + + // Iterate over the entire list grabbing each triplet + const char *C = Files.c_str(); + while (*C != 0) { - string::size_type Tmp = F.Path.rfind('.',Pos); - if (Tmp == string::npos) - break; - if (F.Type == "tar") { - // source v3 has extension 'debian.tar.*' instead of 'diff.*' - if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") - F.Type = "diff"; - break; - } - F.Type = string(F.Path,Tmp+1,Pos-Tmp); - - if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() || - F.Type == "tar") + string hash, size, path; + + // Parse each of the elements + if (ParseQuoteWord(C, hash) == false || + ParseQuoteWord(C, size) == false || + ParseQuoteWord(C, path) == false) + return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str()); + + HashString const hashString(*type, hash); + if (Base.empty() == false) + path = Base + path; + + // look if we have a record for this file already + std::vector<pkgSrcRecords::File>::iterator file = List.begin(); + for (; file != List.end(); ++file) + if (file->Path == path) + break; + + // we have it already, store the new hash and be done + if (file != List.end()) { - Pos = Tmp-1; +#if __GNUC__ >= 4 + // set for compatibility only, so warn users not us + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + if (checksumField == "Files") + file->MD5Hash = hash; +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + // an error here indicates that we have two different hashes for the same file + if (file->Hashes.push_back(hashString) == false) + return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str()); continue; } - - break; + + // we haven't seen this file yet + pkgSrcRecords::File F; + F.Path = path; + F.Size = strtoull(size.c_str(), NULL, 10); + F.Hashes.push_back(hashString); + +#if __GNUC__ >= 4 + // set for compatibility only, so warn users not us + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + if (checksumField == "Files") + F.MD5Hash = hash; +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + + // Try to guess what sort of file it is we are getting. + string::size_type Pos = F.Path.length()-1; + while (1) + { + string::size_type Tmp = F.Path.rfind('.',Pos); + if (Tmp == string::npos) + break; + if (F.Type == "tar") { + // source v3 has extension 'debian.tar.*' instead of 'diff.*' + if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") + F.Type = "diff"; + break; + } + F.Type = string(F.Path,Tmp+1,Pos-Tmp); + + if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() || + F.Type == "tar") + { + Pos = Tmp-1; + continue; + } + + break; + } + List.push_back(F); } - - List.push_back(F); } - + return true; } /*}}}*/ @@ -191,3 +243,21 @@ debSrcRecordParser::~debSrcRecordParser() free(Buffer); } /*}}}*/ + + +debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index) + : debSrcRecordParser(DscFile, Index) +{ + // support clear signed files + if (OpenMaybeClearSignedFile(DscFile, Fd) == false) + { + _error->Error("Failed to open %s", DscFile.c_str()); + return; + } + + // re-init to ensure the updated Fd is used + Tags.Init(&Fd); + // read the first (and only) record + Step(); + +} diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index b65d1480b..a0a151875 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -26,6 +26,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser /** \brief dpointer placeholder (for later in case we need it) */ void *d; + protected: FileFd Fd; pkgTagFile Tags; pkgTagSection Sect; @@ -60,4 +61,10 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual ~debSrcRecordParser(); }; +class debDscRecordParser : public debSrcRecordParser +{ + public: + debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index); +}; + #endif diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 613a4de9f..76b708359 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -517,7 +517,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) void pkgDPkgPM::DoStdin(int master) { unsigned char input_buf[256] = {0,}; - ssize_t len = read(0, input_buf, sizeof(input_buf)); + ssize_t len = read(STDIN_FILENO, input_buf, sizeof(input_buf)); if (len) FileFd::Write(master, input_buf, len); else diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index aa96ac58f..c25672d1c 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1374,7 +1374,7 @@ bool pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator con // the dependency is critical, but can't be installed, so discard the candidate // as the problemresolver will trip over it otherwise trying to install it (#735967) - if (Pkg->CurrentVer != 0) + if (Pkg->CurrentVer != 0 && (PkgState[Pkg->ID].iFlags & Protected) != Protected) SetCandidateVersion(Pkg.CurrentVer()); return false; } diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index ee42267bc..6d1b68c23 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -18,6 +18,7 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/pkgrecords.h> #include <ctype.h> #include <stddef.h> @@ -87,7 +88,12 @@ bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output, void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver) { + pkgRecords Recs(Cache); + pkgRecords::Parser &rec = Recs.Lookup(Ver.FileList()); + string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg(); + fprintf(output, "Package: %s\n", Pkg.Name()); + fprintf(output, "Source: %s\n", srcpkg.c_str()); fprintf(output, "Architecture: %s\n", Ver.Arch()); fprintf(output, "Version: %s\n", Ver.VerStr()); if (Pkg.CurrentVer() == Ver) @@ -107,10 +113,22 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI else if ((Ver->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) fprintf(output, "Multi-Arch: same\n"); signed short Pin = std::numeric_limits<signed short>::min(); - for (pkgCache::VerFileIterator File = Ver.FileList(); File.end() == false; ++File) { - signed short const p = Cache.GetPolicy().GetPriority(File.File()); + std::set<string> Releases; + for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; ++I) { + pkgCache::PkgFileIterator File = I.File(); + signed short const p = Cache.GetPolicy().GetPriority(File); if (Pin < p) Pin = p; + if ((File->Flags & pkgCache::Flag::NotSource) != pkgCache::Flag::NotSource) { + string Release = File.RelStr(); + if (!Release.empty()) + Releases.insert(Release); + } + } + if (!Releases.empty()) { + fprintf(output, "APT-Release:\n"); + for (std::set<string>::iterator R = Releases.begin(); R != Releases.end(); ++R) + fprintf(output, " %s\n", R->c_str()); } fprintf(output, "APT-Pin: %d\n", Pin); if (Cache.GetCandidateVer(Pkg) == Ver) @@ -231,7 +249,16 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade, continue; req->append(" ").append(Pkg.FullName()); } - fprintf(output, "Request: EDSP 0.4\n"); + fprintf(output, "Request: EDSP 0.5\n"); + + const char *arch = _config->Find("APT::Architecture").c_str(); + std::vector<string> archs = APT::Configuration::getArchitectures(); + fprintf(output, "Architecture: %s\n", arch); + fprintf(output, "Architectures:"); + for (std::vector<string>::const_iterator a = archs.begin(); a != archs.end(); ++a) + fprintf(output, " %s", a->c_str()); + fprintf(output, "\n"); + if (del.empty() == false) fprintf(output, "Remove: %s\n", del.c_str()+1); if (inst.empty() == false) @@ -411,6 +438,13 @@ bool EDSP::ReadRequest(int const input, std::list<std::string> &install, distUpgrade = EDSP::StringToBool(line.c_str() + 14, false); else if (line.compare(0, 11, "Autoremove:") == 0) autoRemove = EDSP::StringToBool(line.c_str() + 12, false); + else if (line.compare(0, 13, "Architecture:") == 0) + _config->Set("APT::Architecture", line.c_str() + 14); + else if (line.compare(0, 14, "Architectures:") == 0) + { + std::string const archs = line.c_str() + 15; + _config->Set("APT::Architectures", SubstVar(archs, " ", ",")); + } else _error->Warning("Unknown line in EDSP Request stanza: %s", line.c_str()); @@ -508,7 +542,7 @@ bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE* } /*}}}*/ // EDSP::ExecuteSolver - fork requested solver and setup ipc pipes {{{*/ -bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) { +pid_t EDSP::ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool) { std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers"); std::string file; for (std::vector<std::string>::const_iterator dir = solverDirs.begin(); @@ -520,10 +554,16 @@ bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_o } if (file.empty() == true) - return _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver); + { + _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver); + return 0; + } int external[4] = {-1, -1, -1, -1}; if (pipe(external) != 0 || pipe(external + 2) != 0) - return _error->Errno("Resolve", "Can't create needed IPC pipes for EDSP"); + { + _error->Errno("Resolve", "Can't create needed IPC pipes for EDSP"); + return 0; + } for (int i = 0; i < 4; ++i) SetCloseExec(external[i], true); @@ -540,11 +580,19 @@ bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_o close(external[3]); if (WaitFd(external[1], true, 5) == false) - return _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin"); + { + _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin"); + return 0; + } *solver_in = external[1]; *solver_out = external[2]; - return true; + return Solver; +} +bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) { + if (ExecuteSolver(solver, solver_in, solver_out, true) == 0) + return false; + return true; } /*}}}*/ // EDSP::ResolveExternal - resolve problems by asking external for help {{{*/ @@ -552,7 +600,8 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, bool const upgrade, bool const distUpgrade, bool const autoRemove, OpProgress *Progress) { int solver_in, solver_out; - if (EDSP::ExecuteSolver(solver, &solver_in, &solver_out) == false) + pid_t const solver_pid = EDSP::ExecuteSolver(solver, &solver_in, &solver_out, true); + if (solver_pid == 0) return false; FILE* output = fdopen(solver_in, "w"); @@ -572,6 +621,6 @@ bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache, if (EDSP::ReadResponse(solver_out, Cache, Progress) == false) return false; - return true; + return ExecWait(solver_pid, solver); } /*}}}*/ diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index f3092d3c6..9e833556a 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -205,10 +205,10 @@ public: * \param[out] solver_in will be the stdin of the solver * \param[out] solver_out will be the stdout of the solver * - * \return true if the solver could be started and the pipes - * are set up correctly, otherwise false and the pipes are invalid + * \return PID of the started solver or 0 if failure occurred */ - bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out); + pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/); + APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out); /** \brief call an external resolver to handle the request * diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 854ba1bd7..bb3b5d340 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -516,7 +516,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) return false; } - if (!Record->Hash.VerifyFile(prefix+file)) + if (!Record->Hashes.VerifyFile(prefix+file)) { _error->Warning(_("Hash mismatch for: %s"),file.c_str()); return false; @@ -524,8 +524,10 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) if(Debug == true) { - cout << "File: " << prefix+file << endl; - cout << "Expected Hash " << Record->Hash.toStr() << endl; + cout << "File: " << prefix+file << endl + << "Expected Hash " << endl; + for (HashStringList::const_iterator hs = Record->Hashes.begin(); hs != Record->Hashes.end(); ++hs) + std::cout << "\t- " << hs->toStr() << std::endl; } return true; diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index b5c9ac77e..817165f08 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -59,6 +59,7 @@ class pkgIndexFile const char *Label; virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;}; + virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string /*File*/) const {return 0;}; Type(); virtual ~Type() {}; }; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 5353d1098..5dcaadd76 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -53,7 +53,7 @@ APT_PURE time_t indexRecords::GetValidUntil() const return this->ValidUntil; } -APT_PURE const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) +APT_PURE indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) { std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey); if (sum == Entries.end()) @@ -105,7 +105,7 @@ bool indexRecords::Load(const string Filename) /*{{{*/ return false; indexRecords::checkSum *Sum = new indexRecords::checkSum; Sum->MetaKeyFilename = Name; - Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash); + Sum->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash)); Sum->Size = Size; Entries[Name] = Sum; } diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index e31f889ad..14b03c4d5 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -41,7 +41,7 @@ class indexRecords indexRecords(const std::string ExpectedDist); // Lookup function - virtual const checkSum *Lookup(const std::string MetaKey); + virtual checkSum *Lookup(const std::string MetaKey); /** \brief tests if a checksum for this file is available */ bool Exists(std::string const &MetaKey) const; std::vector<std::string> MetaKeys(); @@ -55,11 +55,21 @@ class indexRecords virtual ~indexRecords(){}; }; +#if __GNUC__ >= 4 + // ensure that con- & de-structor don't trigger this warning + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif struct indexRecords::checkSum { std::string MetaKeyFilename; - HashString Hash; + HashStringList Hashes; unsigned long long Size; + + APT_DEPRECATED HashString Hash; }; +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif #endif diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 5d6bc6bd2..d9df28ba3 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -28,6 +28,7 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/install-progress.h> #include <stddef.h> #include <list> @@ -261,7 +262,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false) continue; - if (EarlyRemove(D.ParentPkg()) == false) + if (EarlyRemove(D.ParentPkg(), &D) == false) return _error->Error("Reverse conflicts early remove for package '%s' failed", Pkg.FullName().c_str()); } @@ -313,18 +314,41 @@ bool pkgPackageManager::ConfigureAll() return true; } /*}}}*/ +// PM::NonLoopingSmart - helper to avoid loops while calling Smart methods /*{{{*/ +// ----------------------------------------------------------------------- +/* ensures that a loop of the form A depends B, B depends A (and similar) + is not leading us down into infinite recursion segfault land */ +bool pkgPackageManager::NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg, + pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop, + bool * const Bad, bool * const Changed) +{ + if (PkgLoop == false) + List->Flag(Pkg,pkgOrderList::Loop); + bool success = false; + switch(action) + { + case UNPACK_IMMEDIATE: success = SmartUnPack(DepPkg, true, Depth + 1); break; + case UNPACK: success = SmartUnPack(DepPkg, false, Depth + 1); break; + case CONFIGURE: success = SmartConfigure(DepPkg, Depth + 1); break; + } + if (PkgLoop == false) + List->RmFlag(Pkg,pkgOrderList::Loop); + + if (success == false) + return false; + + if (Bad != NULL) + *Bad = false; + if (Changed != NULL && List->IsFlag(DepPkg,pkgOrderList::Loop) == false) + *Changed = true; + return true; +} + /*}}}*/ // PM::SmartConfigure - Perform immediate configuration of the pkg /*{{{*/ // --------------------------------------------------------------------- /* This function tries to put the system in a state where Pkg can be configured. - This involves checking each of Pkg's dependanies and unpacking and - configuring packages where needed. - - Note on failure: This method can fail, without causing any problems. - This can happen when using Immediate-Configure-All, SmartUnPack may call - SmartConfigure, it may fail because of a complex dependency situation, but - a error will only be reported if ConfigureAll fails. This is why some of the - messages this function reports on failure (return false;) as just warnings - only shown when debuging*/ + This involves checking each of Pkg's dependencies and unpacking and + configuring packages where needed. */ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) { // If this is true, only check and correct and dependencies without the Loop flag @@ -339,9 +363,9 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) } VerIterator const instVer = Cache[Pkg].InstVerIter(Cache); - - /* Because of the ordered list, most dependencies should be unpacked, - however if there is a loop (A depends on B, B depends on A) this will not + + /* Because of the ordered list, most dependencies should be unpacked, + however if there is a loop (A depends on B, B depends on A) this will not be the case, so check for dependencies before configuring. */ bool Bad = false, Changed = false; const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); @@ -388,25 +412,15 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) if (Debug) std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; Bad = false; - break; } else { if (Debug) clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; - if (PkgLoop == false) - List->Flag(Pkg,pkgOrderList::Loop); - if (SmartUnPack(DepPkg, true, Depth + 1) == true) - { - Bad = false; - if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; - } - if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); - if (Bad == false) - break; + if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false) + return false; } + break; } if (Cur == End || Bad == false) @@ -461,25 +475,12 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) Bad = false; break; } - /* Check for a loop to prevent one forming - If A depends on B and B depends on A, SmartConfigure will - just hop between them if this is not checked. Dont remove the - loop flag after finishing however as loop is already set. - This means that there is another SmartConfigure call for this - package and it will remove the loop flag */ - if (PkgLoop == false) - List->Flag(Pkg,pkgOrderList::Loop); - if (SmartConfigure(DepPkg, Depth + 1) == true) - { - Bad = false; - if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; - } - if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); - // If SmartConfigure was succesfull, Bad is false, so break - if (Bad == false) - break; + if (Debug) + std::clog << OutputInDepth(Depth) << "Configure already unpacked " << DepPkg << std::endl; + if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false) + return false; + break; + } else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) { @@ -498,19 +499,16 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) if (i++ > max_loops) return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str()); } while (Changed == true); - - if (Bad) { - if (Debug) - _error->Warning(_("Could not configure '%s'. "),Pkg.FullName().c_str()); - return false; - } - + + if (Bad == true) + return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str()); + if (PkgLoop) return true; static std::string const conf = _config->Find("PackageManager::Configure","all"); static bool const ConfigurePkgs = (conf == "all" || conf == "smart"); - if (List->IsFlag(Pkg,pkgOrderList::Configured)) + if (List->IsFlag(Pkg,pkgOrderList::Configured)) return _error->Error("Internal configure error on '%s'.", Pkg.FullName().c_str()); if (ConfigurePkgs == true && Configure(Pkg) == false) @@ -527,7 +525,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)) continue; - SmartConfigure(P, (Depth +1)); + if (SmartConfigure(P, (Depth +1)) == false) + return false; } // Sanity Check @@ -542,28 +541,36 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) /* This is called to deal with conflicts arising from unpacking */ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg) { + return EarlyRemove(Pkg, NULL); +} +bool pkgPackageManager::EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) +{ if (List->IsNow(Pkg) == false) return true; - + // Already removed it if (List->IsFlag(Pkg,pkgOrderList::Removed) == true) return true; - + // Woops, it will not be re-installed! if (List->IsFlag(Pkg,pkgOrderList::InList) == false) return false; + // these breaks on M-A:same packages can be dealt with. They 'loop' by design + if (Dep != NULL && (*Dep)->Type == pkgCache::Dep::DpkgBreaks && Dep->IsMultiArchImplicit() == true) + return true; + // Essential packages get special treatment bool IsEssential = false; if ((Pkg->Flags & pkgCache::Flag::Essential) != 0 || (Pkg->Flags & pkgCache::Flag::Important) != 0) IsEssential = true; - /* Check for packages that are the dependents of essential packages and + /* Check for packages that are the dependents of essential packages and promote them too */ if (Pkg->CurrentVer != 0) { - for (DepIterator D = Pkg.RevDependsList(); D.end() == false && + for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false && IsEssential == false; ++D) if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0 || @@ -580,11 +587,14 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg) "but if you really want to do it, activate the " "APT::Force-LoopBreak option."),Pkg.FullName().c_str()); } - + // dpkg will auto-deconfigure it, no need for the big remove hammer + else if (Dep != NULL && (*Dep)->Type == pkgCache::Dep::DpkgBreaks) + return true; + bool Res = SmartRemove(Pkg); if (Cache[Pkg].Delete() == false) List->Flag(Pkg,pkgOrderList::Removed,pkgOrderList::States); - + return Res; } /*}}}*/ @@ -629,13 +639,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c VerIterator const instVer = Cache[Pkg].InstVerIter(Cache); - /* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked. + /* PreUnpack Checks: This loop checks and attempts to rectify any problems that would prevent the package being unpacked. It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with - complex dependency structures, trying to configure some packages while breaking the loops can complicate things . + complex dependency structures, trying to configure some packages while breaking the loops can complicate things. This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */ - bool Changed = false; + bool SomethingBad = false, Changed = false; + bool couldBeTemporaryRemoved = Depth != 0 && List->IsFlag(Pkg,pkgOrderList::Removed) == false; const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); unsigned int i = 0; do @@ -683,184 +694,142 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c for (Version **I = VList; *I != 0; ++I) { VerIterator Ver(Cache,*I); - PkgIterator Pkg = Ver.ParentPkg(); + PkgIterator DepPkg = Ver.ParentPkg(); // Not the install version - if (Cache[Pkg].InstallVer != *I || - (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)) + if (Cache[DepPkg].InstallVer != *I || + (Cache[DepPkg].Keep() == true && DepPkg.State() == PkgIterator::NeedsNothing)) continue; - if (List->IsFlag(Pkg,pkgOrderList::Configured)) + if (List->IsFlag(DepPkg,pkgOrderList::Configured)) { Bad = false; break; } // check if it needs unpack or if if configure is enough - if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false) + if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false) { if (Debug) - clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << Pkg.FullName() << endl; - // SmartUnpack with the ImmediateFlag to ensure its really ready - if (SmartUnPack(Pkg, true, Depth + 1) == true) - { - Bad = false; - if (List->IsFlag(Pkg,pkgOrderList::Loop) == false) - Changed = true; - break; - } + clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << DepPkg.FullName() << endl; + if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false) + return false; } else { if (Debug) - clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.FullName() << endl; - if (SmartConfigure(Pkg, Depth + 1) == true) - { - Bad = false; - if (List->IsFlag(Pkg,pkgOrderList::Loop) == false) - Changed = true; - break; - } + clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << DepPkg.FullName() << endl; + if (NonLoopingSmart(CONFIGURE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false) + return false; } + break; } } if (Bad == true) - { - if (Start == End) - return _error->Error("Couldn't configure pre-depend %s for %s, " - "probably a dependency cycle.", - End.TargetPkg().FullName().c_str(),Pkg.FullName().c_str()); - } - else - continue; + SomethingBad = true; } else if (End->Type == pkgCache::Dep::Conflicts || - End->Type == pkgCache::Dep::Obsoletes) + End->Type == pkgCache::Dep::Obsoletes || + End->Type == pkgCache::Dep::DpkgBreaks) { - /* Look for conflicts. Two packages that are both in the install - state cannot conflict so we don't check.. */ SPtrArray<Version *> VList = End.AllTargets(); - for (Version **I = VList; *I != 0; I++) + for (Version **I = VList; *I != 0; ++I) { VerIterator Ver(Cache,*I); PkgIterator ConflictPkg = Ver.ParentPkg(); - VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer); + if (ConflictPkg.CurrentVer() != Ver) + { + if (Debug) + std::clog << OutputInDepth(Depth) << "Ignore not-installed version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << End << std::endl; + continue; + } - // See if the current version is conflicting - if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg)) + if (List->IsNow(ConflictPkg) == false) { if (Debug) - clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl; - /* If a loop is not present or has not yet been detected, attempt to unpack packages - to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */ - if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false) - { - if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) - { - if (Debug) - clog << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to prevent conflict" << endl; - List->Flag(Pkg,pkgOrderList::Loop); - if (SmartUnPack(ConflictPkg,false, Depth + 1) == true) - if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false) - Changed = true; - // Remove loop to allow it to be used later if needed - List->RmFlag(Pkg,pkgOrderList::Loop); - } - else if (EarlyRemove(ConflictPkg) == false) - return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str()); - } - else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false) + std::clog << OutputInDepth(Depth) << "Ignore already dealt-with version " << Ver.VerStr() << " of " << ConflictPkg.FullName() << " for " << End << std::endl; + continue; + } + + if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true) + { + if (Debug) + clog << OutputInDepth(Depth) << "Ignoring " << End << " as " << ConflictPkg.FullName() << "was temporarily removed" << endl; + continue; + } + + if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) && PkgLoop) + { + if (End->Type == pkgCache::Dep::DpkgBreaks && End.IsMultiArchImplicit() == true) { if (Debug) - clog << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.FullName() << " to conflict violation" << endl; - if (EarlyRemove(ConflictPkg) == false) - return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); + clog << OutputInDepth(Depth) << "Because dependency is MultiArchImplicit we ignored looping on: " << ConflictPkg << endl; + continue; } - } - } - } - else if (End->Type == pkgCache::Dep::DpkgBreaks) - { - SPtrArray<Version *> VList = End.AllTargets(); - for (Version **I = VList; *I != 0; ++I) - { - VerIterator Ver(Cache,*I); - PkgIterator BrokenPkg = Ver.ParentPkg(); - if (BrokenPkg.CurrentVer() != Ver) - { if (Debug) - std::clog << OutputInDepth(Depth) << " Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl; + { + if (End->Type == pkgCache::Dep::DpkgBreaks) + clog << OutputInDepth(Depth) << "Because of breaks knot, deconfigure " << ConflictPkg.FullName() << " temporarily" << endl; + else + clog << OutputInDepth(Depth) << "Because of conflict knot, removing " << ConflictPkg.FullName() << " temporarily" << endl; + } + if (EarlyRemove(ConflictPkg, &End) == false) + return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); + SomethingBad = true; continue; } - // Check if it needs to be unpacked - if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && - List->IsNow(BrokenPkg)) + if (Cache[ConflictPkg].Delete() == false) { - if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop) + if (Debug) { - // This dependency has already been dealt with by another SmartUnPack on Pkg - break; + clog << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to avoid " << End; + if (PkgLoop == true) + clog << " (Looping)"; + clog << std::endl; } - else + // we would like to avoid temporary removals and all that at best via a simple unpack + _error->PushToStack(); + if (NonLoopingSmart(UNPACK, Pkg, ConflictPkg, Depth, PkgLoop, NULL, &Changed) == false) { - // Found a break, so see if we can unpack the package to avoid it - // but do not set loop if another SmartUnPack already deals with it - // Also, avoid it if the package we would unpack pre-depends on this one - VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer); - bool circle = false; - for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D) + // but if it fails ignore this failure and look for alternative ways of solving + if (Debug) + { + clog << OutputInDepth(Depth) << "Avoidance unpack of " << ConflictPkg.FullName() << " failed for " << End << std::endl; + _error->DumpErrors(std::clog); + } + _error->RevertToStack(); + // ignorance can only happen if a) one of the offenders is already gone + if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == true) { - if (D->Type != pkgCache::Dep::PreDepends) - continue; - SPtrArray<Version *> VL = D.AllTargets(); - for (Version **I = VL; *I != 0; ++I) - { - VerIterator V(Cache,*I); - PkgIterator P = V.ParentPkg(); - // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers - if (P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V)) - continue; - circle = true; - break; - } - if (circle == true) - break; + if (Debug) + clog << OutputInDepth(Depth) << "But " << ConflictPkg.FullName() << " was temporarily removed in the meantime to satisfy " << End << endl; } - if (circle == true) + else if (List->IsFlag(Pkg,pkgOrderList::Removed) == true) { if (Debug) - clog << OutputInDepth(Depth) << " Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl; - continue; + clog << OutputInDepth(Depth) << "But " << Pkg.FullName() << " was temporarily removed in the meantime to satisfy " << End << endl; } + // or b) we can make one go (removal or dpkg auto-deconfigure) else { if (Debug) - { - clog << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.FullName() << " to avoid " << End; - if (PkgLoop == true) - clog << " (Looping)"; - clog << std::endl; - } - if (PkgLoop == false) - List->Flag(Pkg,pkgOrderList::Loop); - if (SmartUnPack(BrokenPkg, false, Depth + 1) == true) - { - if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) == false) - Changed = true; - } - if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); + clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " << End << endl; + if (EarlyRemove(ConflictPkg, &End) == false) + return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str()); } } + else + _error->MergeWithStack(); } - // Check if a package needs to be removed - else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false) + else { if (Debug) - clog << OutputInDepth(Depth) << " Removing " << BrokenPkg.FullName() << " to avoid " << End << endl; - SmartRemove(BrokenPkg); + clog << OutputInDepth(Depth) << "Removing " << ConflictPkg.FullName() << " now to avoid " << End << endl; + // no earlyremove() here as user has already agreed to the permanent removal + if (SmartRemove(Pkg) == false) + return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str()); } } } @@ -868,7 +837,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c if (i++ > max_loops) return _error->Error("Internal error: APT::pkgPackageManager::MaxLoopCount reached in SmartConfigure for %s, aborting", Pkg.FullName().c_str()); } while (Changed == true); - + + if (SomethingBad == true) + return _error->Error("Couldn't configure %s, probably a dependency cycle.", Pkg.FullName().c_str()); + + if (couldBeTemporaryRemoved == true && List->IsFlag(Pkg,pkgOrderList::Removed) == true) + { + if (Debug) + std::clog << OutputInDepth(Depth) << "Prevent unpack as " << Pkg << " is currently temporarily removed" << std::endl; + return true; + } + // Check for reverse conflicts. if (CheckRConflicts(Pkg,Pkg.RevDependsList(), instVer.VerStr()) == false) @@ -929,7 +908,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c if (Immediate == true) { // Perform immedate configuration of the package. if (SmartConfigure(Pkg, Depth + 1) == false) - _error->Warning(_("Could not perform immediate configuration on '%s'. " + _error->Error(_("Could not perform immediate configuration on '%s'. " "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2); } diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 344ed9192..558132ceb 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -44,6 +44,11 @@ class pkgDepCache; class pkgSourceList; class pkgOrderList; class pkgRecords; +namespace APT { + namespace Progress { + class PackageManager; + }; +}; class pkgPackageManager : protected pkgCache::Namespace @@ -79,13 +84,14 @@ class pkgPackageManager : protected pkgCache::Namespace // Install helpers bool ConfigureAll(); - bool SmartConfigure(PkgIterator Pkg, int const Depth); + bool SmartConfigure(PkgIterator Pkg, int const Depth) APT_MUSTCHECK; //FIXME: merge on abi break - bool SmartUnPack(PkgIterator Pkg); - bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth); - bool SmartRemove(PkgIterator Pkg); - bool EarlyRemove(PkgIterator Pkg); - + bool SmartUnPack(PkgIterator Pkg) APT_MUSTCHECK; + bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth) APT_MUSTCHECK; + bool SmartRemove(PkgIterator Pkg) APT_MUSTCHECK; + bool EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) APT_MUSTCHECK; + APT_DEPRECATED bool EarlyRemove(PkgIterator Pkg) APT_MUSTCHECK; + // The Actual installation implementation virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;}; virtual bool Configure(PkgIterator /*Pkg*/) {return false;}; @@ -139,6 +145,12 @@ class pkgPackageManager : protected pkgCache::Namespace pkgPackageManager(pkgDepCache *Cache); virtual ~pkgPackageManager(); + + private: + enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE }; + APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg, + pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop, + bool * const Bad, bool * const Changed) APT_MUSTCHECK; }; #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index c1a3c0c55..4fbdc93d5 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -55,7 +55,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ MajorVersion = 9; - MinorVersion = 1; + MinorVersion = 2; Dirty = false; HeaderSz = sizeof(pkgCache::Header); @@ -164,15 +164,23 @@ bool pkgCache::ReMap(bool const &Errorchecks) if (Map.Size() < HeaderP->CacheFileSize) return _error->Error(_("The package cache file is corrupted, it is too small")); + if (HeaderP->VerSysName == 0 || HeaderP->Architecture == 0 || HeaderP->Architectures == 0) + return _error->Error(_("The package cache file is corrupted")); + // Locate our VS.. - if (HeaderP->VerSysName == 0 || - (VS = pkgVersioningSystem::GetVS(StrP + HeaderP->VerSysName)) == 0) + if ((VS = pkgVersioningSystem::GetVS(StrP + HeaderP->VerSysName)) == 0) return _error->Error(_("This APT does not support the versioning system '%s'"),StrP + HeaderP->VerSysName); - // Chcek the arhcitecture - if (HeaderP->Architecture == 0 || - _config->Find("APT::Architecture") != StrP + HeaderP->Architecture) - return _error->Error(_("The package cache was built for a different architecture")); + // Check the architecture + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + std::vector<std::string>::const_iterator a = archs.begin(); + std::string list = *a; + for (++a; a != archs.end(); ++a) + list.append(",").append(*a); + if (_config->Find("APT::Architecture") != StrP + HeaderP->Architecture || + list != StrP + HeaderP->Architectures) + return _error->Error(_("The package cache was built for different architectures: %s vs %s"), StrP + HeaderP->Architectures, list.c_str()); + return true; } /*}}}*/ @@ -818,7 +826,7 @@ int pkgCache::VerIterator::CompareVer(const VerIterator &B) const // VerIterator::Downloadable - Checks if the version is downloadable /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCache::VerIterator::Downloadable() const +APT_PURE bool pkgCache::VerIterator::Downloadable() const { VerFileIterator Files = FileList(); for (; Files.end() == false; ++Files) @@ -831,7 +839,7 @@ bool pkgCache::VerIterator::Downloadable() const // --------------------------------------------------------------------- /* This checks to see if any of the versions files are not NotAutomatic. True if this version is selectable for automatic installation. */ -bool pkgCache::VerIterator::Automatic() const +APT_PURE bool pkgCache::VerIterator::Automatic() const { VerFileIterator Files = FileList(); for (; Files.end() == false; ++Files) diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 43d379ddf..55f0187f9 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -138,7 +138,7 @@ class pkgCache /*{{{*/ /** \brief priority of a package version Zero is used for unparsable or absent Priority fields. */ - enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5}; + enum VerPriority {Required=1,Important=2,Standard=3,Optional=4,Extra=5}; enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4}; enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2, @@ -286,8 +286,10 @@ struct pkgCache::Header map_ptrloc StringList; /** \brief String representing the version system used */ map_ptrloc VerSysName; - /** \brief Architecture(s) the cache was built against */ + /** \brief native architecture the cache was built against */ map_ptrloc Architecture; + /** \brief all architectures the cache was built against */ + map_ptrloc Architectures; /** \brief The maximum size of a raw entry from the original Package file */ unsigned long MaxVerFileSize; /** \brief The maximum size of a raw entry from the original Translation file */ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 367115609..9615b4c22 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -74,13 +74,31 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : // Starting header *Cache.HeaderP = pkgCache::Header(); map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label); + if (unlikely(idxVerSysName == 0)) + return; Cache.HeaderP->VerSysName = idxVerSysName; // this pointer is set in ReMap, but we need it now for WriteUniqString Cache.StringItemP = (pkgCache::StringItem *)Map.Data(); map_ptrloc const idxArchitecture = WriteUniqString(_config->Find("APT::Architecture")); - Cache.HeaderP->Architecture = idxArchitecture; - if (unlikely(idxVerSysName == 0 || idxArchitecture == 0)) + if (unlikely(idxArchitecture == 0)) return; + Cache.HeaderP->Architecture = idxArchitecture; + + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + if (archs.size() > 1) + { + std::vector<std::string>::const_iterator a = archs.begin(); + std::string list = *a; + for (++a; a != archs.end(); ++a) + list.append(",").append(*a); + map_ptrloc const idxArchitectures = WriteStringInMap(list); + if (unlikely(idxArchitectures == 0)) + return; + Cache.HeaderP->Architectures = idxArchitectures; + } + else + Cache.HeaderP->Architectures = idxArchitecture; + Cache.ReMap(); } else @@ -302,10 +320,9 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); - if (CurMd5.Value().empty() == true || List.Description().empty() == true) + if (CurMd5.Value().empty() == true && List.Description("").empty() == true) return true; - std::string CurLang = List.DescriptionLanguage(); - + std::vector<std::string> availDesc = List.AvailableDescriptionLanguages(); for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { pkgCache::DescIterator VerDesc = Ver.DescriptionList(); @@ -314,31 +331,16 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5) continue; - // don't add a new description if we have one for the given - // md5 && language - if (IsDuplicateDescription(VerDesc, CurMd5, CurLang) == true) - continue; - - pkgCache::DescIterator Desc; - Dynamic<pkgCache::DescIterator> DynDesc(Desc); - - map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, VerDesc->md5sum); - if (unlikely(descindex == 0 && _error->PendingError())) - return _error->Error(_("Error occurred while processing %s (%s%d)"), - Pkg.Name(), "NewDescription", 1); - - Desc->ParentPkg = Pkg.Index(); - - // we add at the end, so that the start is constant as we need - // that to be able to efficiently share these lists - VerDesc = Ver.DescriptionList(); // old value might be invalid after ReMap - for (;VerDesc.end() == false && VerDesc->NextDesc != 0; ++VerDesc); - map_ptrloc * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc; - *LastNextDesc = descindex; + map_ptrloc md5idx = VerDesc->md5sum; + for (std::vector<std::string>::const_iterator CurLang = availDesc.begin(); CurLang != availDesc.end(); ++CurLang) + { + // don't add a new description if we have one for the given + // md5 && language + if (IsDuplicateDescription(VerDesc, CurMd5, *CurLang) == true) + continue; - if (NewFileDesc(Desc,List) == false) - return _error->Error(_("Error occurred while processing %s (%s%d)"), - Pkg.Name(), "NewFileDesc", 1); + AddNewDescription(List, Ver, *CurLang, CurMd5, md5idx); + } // we can stop here as all "same" versions will share the description break; @@ -486,11 +488,10 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator return true; } - /* Record the Description (it is not translated) */ + /* Record the Description(s) based on their master md5sum */ MD5SumValue CurMd5 = List.Description_md5(); - if (CurMd5.Value().empty() == true || List.Description().empty() == true) + if (CurMd5.Value().empty() == true && List.Description("").empty() == true) return true; - std::string CurLang = List.DescriptionLanguage(); /* Before we add a new description we first search in the group for a version with a description of the same MD5 - if so we reuse this @@ -501,28 +502,44 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V) { - if (IsDuplicateDescription(V.DescriptionList(), CurMd5, "") == false) + if (V->DescriptionList == 0 || MD5SumValue(V.DescriptionList().md5()) != CurMd5) continue; Ver->DescriptionList = V->DescriptionList; - return true; } } - // We haven't found reusable descriptions, so add the first description - pkgCache::DescIterator Desc = Ver.DescriptionList(); + // We haven't found reusable descriptions, so add the first description(s) + map_ptrloc md5idx = Ver->DescriptionList == 0 ? 0 : Ver.DescriptionList()->md5sum; + std::vector<std::string> availDesc = List.AvailableDescriptionLanguages(); + for (std::vector<std::string>::const_iterator CurLang = availDesc.begin(); CurLang != availDesc.end(); ++CurLang) + if (AddNewDescription(List, Ver, *CurLang, CurMd5, md5idx) == false) + return false; + return true; +} + /*}}}*/ +bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, MD5SumValue const &CurMd5, map_ptrloc &md5idx) /*{{{*/ +{ + pkgCache::DescIterator Desc; Dynamic<pkgCache::DescIterator> DynDesc(Desc); - map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, 0); + map_ptrloc const descindex = NewDescription(Desc, lang, CurMd5, md5idx); if (unlikely(descindex == 0 && _error->PendingError())) return _error->Error(_("Error occurred while processing %s (%s%d)"), - Pkg.Name(), "NewDescription", 2); + Ver.ParentPkg().Name(), "NewDescription", 1); + + md5idx = Desc->md5sum; + Desc->ParentPkg = Ver.ParentPkg().Index(); - Desc->ParentPkg = Pkg.Index(); - Ver->DescriptionList = descindex; + // we add at the end, so that the start is constant as we need + // that to be able to efficiently share these lists + pkgCache::DescIterator VerDesc = Ver.DescriptionList(); // old value might be invalid after ReMap + for (;VerDesc.end() == false && VerDesc->NextDesc != 0; ++VerDesc); + map_ptrloc * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc; + *LastNextDesc = descindex; if (NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (%s%d)"), - Pkg.Name(), "NewFileDesc", 2); + Ver.ParentPkg().Name(), "NewFileDesc", 1); return true; } diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 1e1a71026..d275c1e42 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -125,6 +125,9 @@ class pkgCacheGenerator /*{{{*/ APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P, pkgCache::VerIterator &V); APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D); + + APT_HIDDEN bool AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, + std::string const &lang, MD5SumValue const &CurMd5, map_ptrloc &md5idx); }; /*}}}*/ // This is the abstract package list parser class. /*{{{*/ @@ -160,8 +163,8 @@ class pkgCacheGenerator::ListParser virtual bool ArchitectureAll() = 0; virtual std::string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0; - virtual std::string Description() = 0; - virtual std::string DescriptionLanguage() = 0; + virtual std::string Description(std::string const &lang) = 0; + virtual std::vector<std::string> AvailableDescriptionLanguages() = 0; virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; /** compare currently parsed version with given version diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index b5237b3a0..a902da8b8 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -18,6 +18,8 @@ #define PKGLIB_PKGRECORDS_H #include <apt-pkg/pkgcache.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/macros.h> #include <string> #include <vector> @@ -56,17 +58,39 @@ class pkgRecords::Parser /*{{{*/ // These refer to the archive file for the Version virtual std::string FileName() {return std::string();}; - virtual std::string MD5Hash() {return std::string();}; - virtual std::string SHA1Hash() {return std::string();}; - virtual std::string SHA256Hash() {return std::string();}; - virtual std::string SHA512Hash() {return std::string();}; virtual std::string SourcePkg() {return std::string();}; virtual std::string SourceVer() {return std::string();}; + /** return all known hashes in this record. + * + * For authentication proposes packages come with hashsums which + * this method is supposed to parse and return so that clients can + * choose the hash to be used. + */ + virtual HashStringList Hashes() const { return HashStringList(); }; + APT_DEPRECATED std::string MD5Hash() const { return GetHashFromHashes("MD5Sum"); }; + APT_DEPRECATED std::string SHA1Hash() const { return GetHashFromHashes("SHA1"); }; + APT_DEPRECATED std::string SHA256Hash() const { return GetHashFromHashes("SHA256"); }; + APT_DEPRECATED std::string SHA512Hash() const { return GetHashFromHashes("SHA512"); }; + // These are some general stats about the package virtual std::string Maintainer() {return std::string();}; - virtual std::string ShortDesc() {return std::string();}; - virtual std::string LongDesc() {return std::string();}; + /** return short description in language from record. + * + * @see #LongDesc + */ + virtual std::string ShortDesc(std::string const &/*lang*/) {return std::string();}; + /** return long description in language from record. + * + * If \b lang is empty the "best" available language will be + * returned as determined by the APT::Languages configuration. + * If a (requested) language can't be found in this record an empty + * string will be returned. + */ + virtual std::string LongDesc(std::string const &/*lang*/) {return std::string();}; + std::string ShortDesc() {return ShortDesc("");}; + std::string LongDesc() {return LongDesc("");}; + virtual std::string Name() {return std::string();}; virtual std::string Homepage() {return std::string();} @@ -77,6 +101,14 @@ class pkgRecords::Parser /*{{{*/ virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;}; virtual ~Parser() {}; + + private: + APT_HIDDEN std::string GetHashFromHashes(char const * const type) const + { + HashStringList const hashes = Hashes(); + HashString const * const hs = hashes.find(type); + return hs != NULL ? hs->HashValue() : ""; + }; }; /*}}}*/ #endif diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index 6e33c67ed..f88ffa7c8 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -85,10 +85,12 @@ class pkgSystem virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0; virtual bool FindIndex(pkgCache::PkgFileIterator File, pkgIndexFile *&Found) const = 0; - + /* Evauluate how 'right' we are for this system based on the filesystem etc.. */ - virtual signed Score(Configuration const &/*Cnf*/) {return 0;}; + virtual signed Score(Configuration const &/*Cnf*/) { + return 0; + }; pkgSystem(); virtual ~pkgSystem() {}; diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 9df0c1d74..261dd8161 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -52,7 +52,15 @@ class pkgAcquire; class pkgIndexFile; class metaIndex; -class pkgSourceList +class pkgSource +{ + protected: + + std::vector<metaIndex *> SrcList; + +}; + +class pkgSourceList : public pkgSource { public: @@ -86,7 +94,7 @@ class pkgSourceList typedef std::vector<metaIndex *>::const_iterator const_iterator; - protected: + public: std::vector<metaIndex *> SrcList; diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 775cf2e5f..81b1c545d 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -81,6 +81,27 @@ bool pkgSrcRecords::Restart() return true; } /*}}}*/ +// SrcRecords::Step - Step to the next Source Record /*{{{*/ +// --------------------------------------------------------------------- +/* Step to the next source package record */ +const pkgSrcRecords::Parser* pkgSrcRecords::Step() +{ + if (Current == Files.end()) + return 0; + + // Step to the next record, possibly switching files + while ((*Current)->Step() == false) + { + if (_error->PendingError() == true) + return 0; + ++Current; + if (Current == Files.end()) + return 0; + } + + return *Current; +} + /*}}}*/ // SrcRecords::Find - Find the first source package with the given name /*{{{*/ // --------------------------------------------------------------------- /* This searches on both source package names and output binary names and @@ -88,21 +109,11 @@ bool pkgSrcRecords::Restart() function to be called multiple times to get successive entries */ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOnly) { - if (Current == Files.end()) - return 0; - while (true) { - // Step to the next record, possibly switching files - while ((*Current)->Step() == false) - { - if (_error->PendingError() == true) - return 0; - ++Current; - if (Current == Files.end()) - return 0; - } - + if(Step() == 0) + return 0; + // IO error somehow if (_error->PendingError() == true) return 0; diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 9915debfe..c68d374bb 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -14,6 +14,7 @@ #define PKGLIB_SRCRECORDS_H #include <apt-pkg/macros.h> +#include <apt-pkg/hashes.h> #include <string> #include <vector> @@ -29,15 +30,24 @@ class pkgSrcRecords { public: +#if __GNUC__ >= 4 + // ensure that con- & de-structor don't trigger this warning + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif // Describes a single file struct File { - std::string MD5Hash; - unsigned long Size; std::string Path; std::string Type; + unsigned long long Size; + HashStringList Hashes; + APT_DEPRECATED std::string MD5Hash; }; - +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + // Abstract parser for each source record class Parser { @@ -95,8 +105,13 @@ class pkgSrcRecords // Reset the search bool Restart(); - // Locate a package by name - Parser *Find(const char *Package,bool const &SrcOnly = false); + // Step to the next SourcePackage and return pointer to the + // next SourceRecord. The pointer is owned by libapt. + const Parser* Step(); + + // Locate a package by name and return pointer to the Parser. + // The pointer is owned by libapt. + Parser* Find(const char *Package,bool const &SrcOnly = false); pkgSrcRecords(pkgSourceList &List); virtual ~pkgSrcRecords(); diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 91d176e3c..52f4da2d5 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -47,16 +47,43 @@ public: unsigned long long Size; }; +static unsigned long AlphaHash(const char *Text, size_t Length) /*{{{*/ +{ + /* This very simple hash function for the last 8 letters gives + very good performance on the debian package files */ + if (Length > 8) + { + Text += (Length - 8); + Length = 8; + } + unsigned long Res = 0; + for (size_t i = 0; i < Length; ++i) + Res = ((unsigned long)(Text[i]) & 0xDF) ^ (Res << 1); + return Res & 0xFF; +} + /*}}}*/ + // TagFile::pkgTagFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long long Size) + : d(NULL) +{ + Init(pFd, Size); +} + +void pkgTagFile::Init(FileFd *pFd,unsigned long long Size) { /* The size is increased by 4 because if we start with the Size of the filename we need to try to read 1 char more to see an EOF faster, 1 char the end-pointer can be on and maybe 2 newlines need to be added to the end of the file -> 4 extra chars */ Size += 4; + if(d != NULL) + { + free(d->Buffer); + delete d; + } d = new pkgTagFilePrivate(pFd, Size); if (d->Fd.IsOpen() == false) @@ -128,18 +155,23 @@ bool pkgTagFile::Resize(unsigned long long const newSize) */ bool pkgTagFile::Step(pkgTagSection &Tag) { - while (Tag.Scan(d->Start,d->End - d->Start) == false) + if(Tag.Scan(d->Start,d->End - d->Start) == false) { - if (Fill() == false) - return false; - - if(Tag.Scan(d->Start,d->End - d->Start)) - break; + do + { + if (Fill() == false) + return false; + + if(Tag.Scan(d->Start,d->End - d->Start, false)) + break; - if (Resize() == false) - return _error->Error(_("Unable to parse package file %s (1)"), - d->Fd.Name().c_str()); + if (Resize() == false) + return _error->Error(_("Unable to parse package file %s (1)"), + d->Fd.Name().c_str()); + + } while (Tag.Scan(d->Start,d->End - d->Start, false) == false); } + d->Start += Tag.size(); d->iOffset += Tag.size(); @@ -233,7 +265,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset) if (Fill() == false) return false; - if (Tag.Scan(d->Start, d->End - d->Start) == false) + if (Tag.Scan(d->Start, d->End - d->Start, false) == false) return _error->Error(_("Unable to parse package file %s (2)"),d->Fd.Name().c_str()); return true; @@ -243,27 +275,46 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset) // --------------------------------------------------------------------- /* */ pkgTagSection::pkgTagSection() - : Section(0), TagCount(0), d(NULL), Stop(0) + : Section(0), d(NULL), Stop(0) { - memset(&Indexes, 0, sizeof(Indexes)); - memset(&AlphaIndexes, 0, sizeof(AlphaIndexes)); + memset(&LookupTable, 0, sizeof(LookupTable)); } /*}}}*/ // TagSection::Scan - Scan for the end of the header information /*{{{*/ -// --------------------------------------------------------------------- -/* This looks for the first double new line in the data stream. - It also indexes the tags in the section. */ -bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) +bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const Restart) { + Section = Start; const char *End = Start + MaxLength; - Stop = Section = Start; - memset(AlphaIndexes,0,sizeof(AlphaIndexes)); + + if (Restart == false && Tags.empty() == false) + { + Stop = Section + Tags.back().StartTag; + if (End <= Stop) + return false; + Stop = (const char *)memchr(Stop,'\n',End - Stop); + if (Stop == NULL) + return false; + ++Stop; + } + else + { + Stop = Section; + if (Tags.empty() == false) + { + memset(&LookupTable, 0, sizeof(LookupTable)); + Tags.clear(); + } + Tags.reserve(0x100); + } + size_t TagCount = Tags.size(); if (Stop == 0) return false; - TagCount = 0; - while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End) + TagData lastTagData(0); + lastTagData.EndTag = 0; + unsigned long lastTagHash = 0; + while (Stop < End) { TrimRecord(true,End); @@ -275,12 +326,39 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) // Start a new index and add it to the hash if (isspace(Stop[0]) == 0) { - Indexes[TagCount++] = Stop - Section; - AlphaIndexes[AlphaHash(Stop,End)] = TagCount; + // store the last found tag + if (lastTagData.EndTag != 0) + { + if (LookupTable[lastTagHash] != 0) + lastTagData.NextInBucket = LookupTable[lastTagHash]; + LookupTable[lastTagHash] = TagCount; + Tags.push_back(lastTagData); + } + + ++TagCount; + lastTagData = TagData(Stop - Section); + // find the colon separating tag and value + char const * Colon = (char const *) memchr(Stop, ':', End - Stop); + if (Colon == NULL) + return false; + // find the end of the tag (which might or might not be the colon) + char const * EndTag = Colon; + --EndTag; + for (; EndTag > Stop && isspace(*EndTag) != 0; --EndTag) + ; + ++EndTag; + lastTagData.EndTag = EndTag - Section; + lastTagHash = AlphaHash(Stop, EndTag - Stop); + // find the beginning of the value + Stop = Colon + 1; + for (; isspace(*Stop) != 0; ++Stop); + if (Stop >= End) + return false; + lastTagData.StartValue = Stop - Section; } Stop = (const char *)memchr(Stop,'\n',End - Stop); - + if (Stop == 0) return false; @@ -291,7 +369,16 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) // Double newline marks the end of the record if (Stop+1 < End && Stop[1] == '\n') { - Indexes[TagCount] = Stop - Section; + if (lastTagData.EndTag != 0) + { + if (LookupTable[lastTagHash] != 0) + lastTagData.NextInBucket = LookupTable[lastTagHash]; + LookupTable[lastTagHash] = TagCount; + Tags.push_back(lastTagData); + } + + TagData const td(Stop - Section); + Tags.push_back(td); TrimRecord(false,End); return true; } @@ -320,8 +407,8 @@ void pkgTagSection::Trim() for (; Stop > Section + 2 && (Stop[-2] == '\n' || Stop[-2] == '\r'); Stop--); } /*}}}*/ -// TagSection::Exists - return True if a tag exists /*{{{*/ -bool pkgTagSection::Exists(const char* const Tag) +// TagSection::Exists - return True if a tag exists /*{{{*/ +bool pkgTagSection::Exists(const char* const Tag) const { unsigned int tmp; return Find(Tag, tmp); @@ -332,73 +419,43 @@ bool pkgTagSection::Exists(const char* const Tag) /* This searches the section for a tag that matches the given string. */ bool pkgTagSection::Find(const char *Tag,unsigned int &Pos) const { - unsigned int Length = strlen(Tag); - unsigned int I = AlphaIndexes[AlphaHash(Tag)]; - if (I == 0) + size_t const Length = strlen(Tag); + unsigned int Bucket = LookupTable[AlphaHash(Tag, Length)]; + if (Bucket == 0) return false; - I--; - - for (unsigned int Counter = 0; Counter != TagCount; Counter++, - I = (I+1)%TagCount) + + for (; Bucket != 0; Bucket = Tags[Bucket - 1].NextInBucket) { - const char *St; - St = Section + Indexes[I]; - if (strncasecmp(Tag,St,Length) != 0) + if ((Tags[Bucket - 1].EndTag - Tags[Bucket - 1].StartTag) != Length) continue; - // Make sure the colon is in the right place - const char *C = St + Length; - for (; isspace(*C) != 0; C++); - if (*C != ':') + char const * const St = Section + Tags[Bucket - 1].StartTag; + if (strncasecmp(Tag,St,Length) != 0) continue; - Pos = I; + + Pos = Bucket - 1; return true; } Pos = 0; return false; } - /*}}}*/ -// TagSection::Find - Locate a tag /*{{{*/ -// --------------------------------------------------------------------- -/* This searches the section for a tag that matches the given string. */ bool pkgTagSection::Find(const char *Tag,const char *&Start, const char *&End) const { - unsigned int Length = strlen(Tag); - unsigned int I = AlphaIndexes[AlphaHash(Tag)]; - if (I == 0) + unsigned int Pos; + if (Find(Tag, Pos) == false) return false; - I--; - - for (unsigned int Counter = 0; Counter != TagCount; Counter++, - I = (I+1)%TagCount) - { - const char *St; - St = Section + Indexes[I]; - if (strncasecmp(Tag,St,Length) != 0) - continue; - - // Make sure the colon is in the right place - const char *C = St + Length; - for (; isspace(*C) != 0; C++); - if (*C != ':') - continue; - // Strip off the gunk from the start end - Start = C; - End = Section + Indexes[I+1]; - if (Start >= End) - return _error->Error("Internal parsing error"); - - for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++); - for (; isspace(End[-1]) != 0 && End > Start; End--); - - return true; - } - - Start = End = 0; - return false; + Start = Section + Tags[Pos].StartValue; + // Strip off the gunk from the end + End = Section + Tags[Pos + 1].StartTag; + if (unlikely(Start > End)) + return _error->Error("Internal parsing error"); + + for (; isspace(End[-1]) != 0 && End > Start; --End); + + return true; } /*}}}*/ // TagSection::FindS - Find a string /*{{{*/ @@ -493,6 +550,13 @@ bool pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag, return true; } /*}}}*/ +APT_PURE unsigned int pkgTagSection::Count() const { /*{{{*/ + if (Tags.empty() == true) + return 0; + // the last element is just marking the end and isn't a real one + return Tags.size() - 1; +} + /*}}}*/ // TFRewrite - Rewrite a control record /*{{{*/ // --------------------------------------------------------------------- /* This writes the control record to stdout rewriting it as necessary. The diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index d5b62e76d..b0cfab759 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -25,6 +25,8 @@ #include <stdio.h> #include <string> +#include <vector> +#include <list> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/fileutl.h> @@ -35,23 +37,20 @@ class FileFd; class pkgTagSection { const char *Section; - // We have a limit of 256 tags per section. - unsigned int Indexes[256]; - unsigned int AlphaIndexes[0x100]; - unsigned int TagCount; + struct TagData { + unsigned int StartTag; + unsigned int EndTag; + unsigned int StartValue; + unsigned int NextInBucket; + + TagData(unsigned int const StartTag) : StartTag(StartTag), NextInBucket(0) {} + }; + std::vector<TagData> Tags; + unsigned int LookupTable[0x100]; + // dpointer placeholder (for later in case we need it) void *d; - /* This very simple hash function for the last 8 letters gives - very good performance on the debian package files */ - inline static unsigned long AlphaHash(const char *Text, const char *End = 0) - { - unsigned long Res = 0; - for (; Text != End && *Text != ':' && *Text != 0; Text++) - Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); - return Res & 0xFF; - } - protected: const char *Stop; @@ -69,17 +68,39 @@ class pkgTagSection unsigned long Flag) const; bool static FindFlag(unsigned long &Flags, unsigned long Flag, const char* Start, const char* Stop); - bool Scan(const char *Start,unsigned long MaxLength); + + /** \brief searches the boundaries of the current section + * + * While parameter Start marks the beginning of the section, this method + * will search for the first double newline in the data stream which marks + * the end of the section. It also does a first pass over the content of + * the section parsing it as encountered for processing later on by Find + * + * @param Start is the beginning of the section + * @param MaxLength is the size of valid data in the stream pointed to by Start + * @param Restart if enabled internal state will be cleared, otherwise it is + * assumed that now more data is available in the stream and the parsing will + * start were it encountered insufficent data the last time. + * + * @return \b true if section end was found, \b false otherwise. + * Beware that internal state will be inconsistent if \b false is returned! + */ + APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true); inline unsigned long size() const {return Stop - Section;}; void Trim(); virtual void TrimRecord(bool BeforeRecord, const char* &End); - - inline unsigned int Count() const {return TagCount;}; - bool Exists(const char* const Tag); - + + /** \brief amount of Tags in the current section + * + * Note: if a Tag is mentioned repeatly it will be counted multiple + * times, but only the last occurance is available via Find methods. + */ + unsigned int Count() const; + bool Exists(const char* const Tag) const; + inline void Get(const char *&Start,const char *&Stop,unsigned int I) const - {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];} - + {Start = Section + Tags[I].StartTag; Stop = Section + Tags[I+1].StartTag;} + inline void GetSection(const char *&Start,const char *&Stop) const { Start = Section; @@ -105,6 +126,8 @@ class pkgTagFile unsigned long Offset(); bool Jump(pkgTagSection &Tag,unsigned long long Offset); + void Init(FileFd *F,unsigned long long Size = 32*1024); + pkgTagFile(FileFd *F,unsigned long long Size = 32*1024); virtual ~pkgTagFile(); }; diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index 0f5b53e50..17a12799c 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -64,8 +64,6 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm) cout << '\r' << BlankLine << '\r'; cout << _("Hit ") << Itm.Description; - if (Itm.Owner->FileSize != 0) - cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]"; cout << endl; Update = true; } @@ -142,6 +140,9 @@ void AcqTextStatus::Stop() if (Quiet <= 0) cout << '\r' << BlankLine << '\r' << flush; + if (_config->FindB("quiet::NoStatistic", false) == true) + return; + if (FetchedBytes != 0 && _error->PendingError() == false) ioprintf(cout,_("Fetched %sB in %s (%sB/s)\n"), SizeToStr(FetchedBytes).c_str(), @@ -170,7 +171,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) ScreenWidth = sizeof(Buffer)-1; // Put in the percent done - sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems)); + sprintf(S,"%.0f%%", Percent); bool Shown = false; for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0; diff --git a/apt-private/private-cachefile.h b/apt-private/private-cachefile.h index dce7e0a3a..1fddabfbd 100644 --- a/apt-private/private-cachefile.h +++ b/apt-private/private-cachefile.h @@ -6,7 +6,20 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/macros.h> +#include <apt-pkg/sourcelist.h> +#include <apti18n.h> +// FIXME: we need to find a way to export this +class APT_PUBLIC SourceList : public pkgSourceList +{ + + public: + // Add custom metaIndex (e.g. local files) + void AddMetaIndex(metaIndex *mi) { + SrcList.push_back(mi); + } + +}; // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- @@ -28,6 +41,16 @@ class APT_PUBLIC CacheFile : public pkgCacheFile return false; return true; } + // FIXME: this can go once the "libapt-pkg" pkgSourceList has a way + // to add custom metaIndexes (or custom local files or so) + bool BuildSourceList(OpProgress */*Progress*/ = NULL) { + if (SrcList != NULL) + return true; + SrcList = new SourceList(); + if (SrcList->ReadMainList() == false) + return _error->Error(_("The list of sources could not be read.")); + return true; + } bool Open(bool WithLock = true) { OpTextProgress Prog(*_config); diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index a095f0c67..be7d23c31 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -28,6 +28,11 @@ bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser) if (UntrustedList == "") return true; + return AuthPrompt(UntrustedList, PromptUser); +} + +bool AuthPrompt(std::string UntrustedList, bool const PromptUser) +{ ShowList(c2out,_("WARNING: The following packages cannot be authenticated!"),UntrustedList,""); if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) diff --git a/apt-private/private-download.h b/apt-private/private-download.h index a108aa531..a90ac7eaa 100644 --- a/apt-private/private-download.h +++ b/apt-private/private-download.h @@ -5,7 +5,13 @@ class pkgAcquire; +// Check if all files in the fetcher are authenticated APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser); + +// show a authentication warning prompt and return true if the system +// should continue +APT_PUBLIC bool AuthPrompt(std::string UntrustedList, bool const PromptUser); + APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure); #endif diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 107ed398e..3b94237b4 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -19,6 +19,8 @@ #include <apt-pkg/macros.h> #include <apt-pkg/packagemanager.h> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/install-progress.h> #include <errno.h> #include <stdlib.h> @@ -29,6 +31,7 @@ #include <iostream> #include <set> #include <vector> +#include <map> #include <apt-private/acqprogress.h> #include <apt-private/private-install.h> @@ -617,7 +620,8 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, if (Fix != NULL) { // Call the scored problem resolver - Fix->Resolve(true); + if (Fix->Resolve(true) == false && Cache->BrokenCount() == 0) + return false; } // Now we check the state of the packages, @@ -669,10 +673,34 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, bool DoInstall(CommandLine &CmdL) { CacheFile Cache; + // first check for local pkgs and add them to the cache + for (const char **I = CmdL.FileList; *I != 0; I++) + { + if(FileExists(*I)) + { + // FIXME: make this more elegant + std::string TypeStr = flExtension(*I) + "-file"; + pkgSourceList::Type *Type = pkgSourceList::Type::GetType(TypeStr.c_str()); + if(Type != 0) + { + std::vector<metaIndex *> List; + std::map<std::string, std::string> Options; + if(Type->CreateItem(List, *I, "", "", Options)) + { + // we have our own CacheFile that gives us a SourceList + // with superpowerz + SourceList *sources = (SourceList*)Cache.GetSourceList(); + sources->AddMetaIndex(List[0]); + } + } + } + } + + // then open the cache if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) return false; - + std::map<unsigned short, APT::VersionSet> verset; if(!DoCacheManipulationFromCommandLine(CmdL, Cache, verset)) @@ -801,3 +829,144 @@ bool DoInstall(CommandLine &CmdL) return InstallPackages(Cache,false); } /*}}}*/ + +// TryToInstall - Mark a package for installation /*{{{*/ +void TryToInstall::operator() (pkgCache::VerIterator const &Ver) { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + Cache->GetDepCache()->SetCandidateVersion(Ver); + pkgDepCache::StateCache &State = (*Cache)[Pkg]; + + // Handle the no-upgrade case + if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) + ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + // Ignore request for install if package would be new + else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.FullName(true).c_str()); + else { + if (Fix != NULL) { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + } + Cache->GetDepCache()->MarkInstall(Pkg,false); + + if (State.Install() == false) { + if (_config->FindB("APT::Get::ReInstall",false) == true) { + if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), + Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->SetReInstall(Pkg, true); + } else + ioprintf(c1out,_("%s is already the newest version.\n"), + Pkg.FullName(true).c_str()); + } + + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if (FixBroken == false) + doAutoInstallLater.insert(Pkg); + } + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (State.Install() == false && + (State.Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->GetDepCache()->MarkAuto(Pkg,false); + AutoMarkChanged++; + } +} + /*}}}*/ +bool TryToInstall::propergateReleaseCandiateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out)/*{{{*/ +{ + for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin(); + s != start.end(); ++s) + Cache->GetDepCache()->SetCandidateVersion(s->first); + + bool Success = true; + // the Changed list contains: + // first: "new version" + // second: "what-caused the change" + std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > Changed; + for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin(); + s != start.end(); ++s) + { + Changed.push_back(std::make_pair(s->first, pkgCache::VerIterator(*Cache))); + // We continue here even if it failed to enhance the ShowBroken output + Success &= Cache->GetDepCache()->SetCandidateRelease(s->first, s->second, Changed); + } + for (std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> >::const_iterator c = Changed.begin(); + c != Changed.end(); ++c) + { + if (c->second.end() == true) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + c->first.VerStr(), c->first.RelStr().c_str(), c->first.ParentPkg().FullName(true).c_str()); + else if (c->first.ParentPkg()->Group != c->second.ParentPkg()->Group) + { + pkgCache::VerIterator V = (*Cache)[c->first.ParentPkg()].CandidateVerIter(*Cache); + ioprintf(out, _("Selected version '%s' (%s) for '%s' because of '%s'\n"), V.VerStr(), + V.RelStr().c_str(), V.ParentPkg().FullName(true).c_str(), c->second.ParentPkg().FullName(true).c_str()); + } + } + return Success; +} + /*}}}*/ +void TryToInstall::doAutoInstall() { /*{{{*/ + for (APT::PackageSet::const_iterator P = doAutoInstallLater.begin(); + P != doAutoInstallLater.end(); ++P) { + pkgDepCache::StateCache &State = (*Cache)[P]; + if (State.InstBroken() == false && State.InstPolicyBroken() == false) + continue; + Cache->GetDepCache()->MarkInstall(P, true); + } + doAutoInstallLater.clear(); +} + /*}}}*/ +// TryToRemove - Mark a package for removal /*{{{*/ +void TryToRemove::operator() (pkgCache::VerIterator const &Ver) +{ + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + if (Fix != NULL) + { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Fix->Remove(Pkg); + } + + if ((Pkg->CurrentVer == 0 && PurgePkgs == false) || + (PurgePkgs == true && Pkg->CurrentState == pkgCache::State::NotInstalled)) + { + pkgCache::GrpIterator Grp = Pkg.Group(); + pkgCache::PkgIterator P = Grp.PackageList(); + for (; P.end() != true; P = Grp.NextPkg(P)) + { + if (P == Pkg) + continue; + if (P->CurrentVer != 0 || (PurgePkgs == true && P->CurrentState != pkgCache::State::NotInstalled)) + { + // TRANSLATORS: Note, this is not an interactive question + ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"), + Pkg.FullName(true).c_str(), P.FullName(true).c_str()); + break; + } + } + if (P.end() == true) + ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str()); + + // MarkInstall refuses to install packages on hold + Pkg->SelectedState = pkgCache::State::Hold; + } + else + Cache->GetDepCache()->MarkDelete(Pkg, PurgePkgs); +} + /*}}}*/ diff --git a/apt-private/private-install.h b/apt-private/private-install.h index 5e18560c5..828163e40 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -3,28 +3,18 @@ #include <apt-pkg/cachefile.h> #include <apt-pkg/configuration.h> -#include <apt-pkg/depcache.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> #include <apt-pkg/cacheset.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/algorithms.h> #include <apt-pkg/macros.h> -#include <apt-private/private-output.h> - -#include <stddef.h> -#include <iosfwd> #include <list> -#include <map> #include <string> #include <utility> - -#include <apti18n.h> - class CacheFile; class CommandLine; +class pkgProblemResolver; #define RAMFS_MAGIC 0x858458f6 @@ -39,7 +29,7 @@ APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // TryToInstall - Mark a package for installation /*{{{*/ -struct TryToInstall { +struct APT_PUBLIC TryToInstall { pkgCacheFile* Cache; pkgProblemResolver* Fix; bool FixBroken; @@ -49,109 +39,13 @@ struct TryToInstall { TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const FixBroken) : Cache(&Cache), Fix(PM), FixBroken(FixBroken), AutoMarkChanged(0) {}; - void operator() (pkgCache::VerIterator const &Ver) { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - Cache->GetDepCache()->SetCandidateVersion(Ver); - pkgDepCache::StateCache &State = (*Cache)[Pkg]; - - // Handle the no-upgrade case - if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) - ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.FullName(true).c_str()); - // Ignore request for install if package would be new - else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) - ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), - Pkg.FullName(true).c_str()); - else { - if (Fix != NULL) { - Fix->Clear(Pkg); - Fix->Protect(Pkg); - } - Cache->GetDepCache()->MarkInstall(Pkg,false); - - if (State.Install() == false) { - if (_config->FindB("APT::Get::ReInstall",false) == true) { - if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.FullName(true).c_str()); - else - Cache->GetDepCache()->SetReInstall(Pkg, true); - } else - ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.FullName(true).c_str()); - } - - // Install it with autoinstalling enabled (if we not respect the minial - // required deps or the policy) - if (FixBroken == false) - doAutoInstallLater.insert(Pkg); - } - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (State.Install() == false && - (State.Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->GetDepCache()->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } - - bool propergateReleaseCandiateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > start, std::ostream &out) - { - for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin(); - s != start.end(); ++s) - Cache->GetDepCache()->SetCandidateVersion(s->first); - - bool Success = true; - // the Changed list contains: - // first: "new version" - // second: "what-caused the change" - std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > Changed; - for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin(); - s != start.end(); ++s) - { - Changed.push_back(std::make_pair(s->first, pkgCache::VerIterator(*Cache))); - // We continue here even if it failed to enhance the ShowBroken output - Success &= Cache->GetDepCache()->SetCandidateRelease(s->first, s->second, Changed); - } - for (std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> >::const_iterator c = Changed.begin(); - c != Changed.end(); ++c) - { - if (c->second.end() == true) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - c->first.VerStr(), c->first.RelStr().c_str(), c->first.ParentPkg().FullName(true).c_str()); - else if (c->first.ParentPkg()->Group != c->second.ParentPkg()->Group) - { - pkgCache::VerIterator V = (*Cache)[c->first.ParentPkg()].CandidateVerIter(*Cache); - ioprintf(out, _("Selected version '%s' (%s) for '%s' because of '%s'\n"), V.VerStr(), - V.RelStr().c_str(), V.ParentPkg().FullName(true).c_str(), c->second.ParentPkg().FullName(true).c_str()); - } - } - return Success; - } - - void doAutoInstall() { - for (APT::PackageSet::const_iterator P = doAutoInstallLater.begin(); - P != doAutoInstallLater.end(); ++P) { - pkgDepCache::StateCache &State = (*Cache)[P]; - if (State.InstBroken() == false && State.InstPolicyBroken() == false) - continue; - Cache->GetDepCache()->MarkInstall(P, true); - } - doAutoInstallLater.clear(); - } + void operator() (pkgCache::VerIterator const &Ver); + bool propergateReleaseCandiateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out); + void doAutoInstall(); }; /*}}}*/ // TryToRemove - Mark a package for removal /*{{{*/ -struct TryToRemove { +struct APT_PUBLIC TryToRemove { pkgCacheFile* Cache; pkgProblemResolver* Fix; bool PurgePkgs; @@ -159,43 +53,7 @@ struct TryToRemove { TryToRemove(pkgCacheFile &Cache, pkgProblemResolver *PM) : Cache(&Cache), Fix(PM), PurgePkgs(_config->FindB("APT::Get::Purge", false)) {}; - void operator() (pkgCache::VerIterator const &Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - if (Fix != NULL) - { - Fix->Clear(Pkg); - Fix->Protect(Pkg); - Fix->Remove(Pkg); - } - - if ((Pkg->CurrentVer == 0 && PurgePkgs == false) || - (PurgePkgs == true && Pkg->CurrentState == pkgCache::State::NotInstalled)) - { - pkgCache::GrpIterator Grp = Pkg.Group(); - pkgCache::PkgIterator P = Grp.PackageList(); - for (; P.end() != true; P = Grp.NextPkg(P)) - { - if (P == Pkg) - continue; - if (P->CurrentVer != 0 || (PurgePkgs == true && P->CurrentState != pkgCache::State::NotInstalled)) - { - // TRANSLATORS: Note, this is not an interactive question - ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"), - Pkg.FullName(true).c_str(), P.FullName(true).c_str()); - break; - } - } - if (P.end() == true) - ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str()); - - // MarkInstall refuses to install packages on hold - Pkg->SelectedState = pkgCache::State::Hold; - } - else - Cache->GetDepCache()->MarkDelete(Pkg, PurgePkgs); - } + void operator() (pkgCache::VerIterator const &Ver); }; /*}}}*/ diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index b69002103..e85aaf64c 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -37,28 +37,20 @@ struct PackageSortAlphabetic /*{{{*/ return (l_name < r_name); } }; - /*}}}*/ -class PackageNameMatcher : public Matcher /*{{{*/ + +class PackageNameMatcher : public Matcher { -#ifdef PACKAGE_MATCHER_ABI_COMPAT -#define PackageMatcher PackageNameMatchesFnmatch -#endif public: PackageNameMatcher(const char **patterns) { for(int i=0; patterns[i] != NULL; ++i) { std::string pattern = patterns[i]; -#ifdef PACKAGE_MATCHER_ABI_COMPAT - APT::CacheFilter::PackageNameMatchesFnmatch *cachefilter = NULL; - cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#else APT::CacheFilter::PackageMatcher *cachefilter = NULL; if(_config->FindB("APT::Cmd::Use-Regexp", false) == true) cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern); else cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); -#endif filters.push_back(cachefilter); } } diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 7f3eef6c2..8f190a551 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -23,6 +23,7 @@ #include <langinfo.h> #include <unistd.h> #include <signal.h> +#include <sys/ioctl.h> #include <apti18n.h> /*}}}*/ @@ -93,7 +94,7 @@ bool InitOutput() /*{{{*/ static std::string GetArchiveSuite(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator ver) /*{{{*/ { std::string suite = ""; - if (ver && ver.FileList() && ver.FileList()) + if (ver && ver.FileList()) { pkgCache::VerFileIterator VF = ver.FileList(); for (; VF.end() == false ; ++VF) diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index da83d7741..fa827dea4 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -75,6 +75,24 @@ bool DoUpdate(CommandLine &CmdL) return false; } + // show basic stats (if the user whishes) + if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true) + { + int upgradable = 0; + Cache.Open(); + for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() != true; ++I) + { + pkgDepCache::StateCache &state = Cache[I]; + if (I->CurrentVer != 0 && state.Upgradable()) + upgradable++; + } + const char *msg = ngettext( + "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n", + "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n", + upgradable); + ioprintf(c1out, msg, upgradable); + } + return true; } /*}}}*/ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 35e9cc3a8..2ed1bf5d4 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -551,7 +551,7 @@ static bool DumpAvail(CommandLine &) break; } - FileFd PkgF(File.FileName(),FileFd::ReadOnly); + FileFd PkgF(File.FileName(),FileFd::ReadOnly, FileFd::Extension); if (_error->PendingError() == true) break; diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 6dd53b78d..0d568106f 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -103,10 +103,12 @@ bool DebFile::DoItem(Item &I, int &Fd) if (strcmp(I.Name, "control") == 0) { delete [] Control; - Control = new char[I.Size+1]; - Control[I.Size] = 0; + Control = new char[I.Size+3]; + Control[I.Size] = '\n'; + Control[I.Size + 1] = '\n'; + Control[I.Size + 2] = '\0'; Which = IsControl; - ControlLen = I.Size; + ControlLen = I.Size + 3; // make it call the Process method below. this is so evil Fd = -2; } @@ -162,9 +164,10 @@ bool DebFile::Process(Item &/*I*/, const unsigned char *data, bool DebFile::ParseInfo() { if (Control == NULL) return false; - + pkgTagSection Section; - Section.Scan(Control, ControlLen); + if (Section.Scan(Control, ControlLen) == false) + return false; Package = Section.FindS("Package"); Version = GetInstalledVer(Package); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 566103f8c..bd866bc8c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -756,6 +756,7 @@ static bool DoSource(CommandLine &CmdL) // Load the requestd sources into the fetcher unsigned J = 0; + std::string UntrustedList; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; @@ -764,6 +765,9 @@ static bool DoSource(CommandLine &CmdL) if (Last == 0) { return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); } + + if (Last->Index().IsTrusted() == false) + UntrustedList += Src + " "; string srec = Last->AsStr(); string::size_type pos = srec.find("\nVcs-"); @@ -828,25 +832,31 @@ static bool DoSource(CommandLine &CmdL) queued.insert(Last->Index().ArchiveURI(I->Path)); // check if we have a file with that md5 sum already localy - if(!I->MD5Hash.empty() && FileExists(flNotDir(I->Path))) - { - FileFd Fd(flNotDir(I->Path), FileFd::ReadOnly); - MD5Summation sum; - sum.AddFD(Fd.Fd(), Fd.Size()); - Fd.Close(); - if((string)sum.Result() == I->MD5Hash) + std::string localFile = flNotDir(I->Path); + if (FileExists(localFile) == true) + if(I->Hashes.VerifyFile(localFile) == true) { ioprintf(c1out,_("Skipping already downloaded file '%s'\n"), - flNotDir(I->Path).c_str()); + localFile.c_str()); continue; } + + // see if we have a hash (Acquire::ForceHash is the only way to have none) + if (I->Hashes.usable() == false && _config->FindB("APT::Get::AllowUnauthenticated",false) == false) + { + ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n", + localFile.c_str()); + continue; } new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path), - I->MD5Hash,I->Size, - Last->Index().SourceInfo(*Last,*I),Src); + I->Hashes, I->Size, Last->Index().SourceInfo(*Last,*I), Src); } } + + // check authentication status of the source as well + if (UntrustedList != "" && !AuthPrompt(UntrustedList, false)) + return false; // Display statistics unsigned long long FetchBytes = Fetcher.FetchNeeded(); @@ -1053,7 +1063,30 @@ static bool DoBuildDep(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; - pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache); + pkgSrcRecords::Parser *Last = 0; + + // a unpacked debian source tree + if (DirectoryExists(*I)) + { + // FIXME: how can we make this more elegant? + std::string TypeName = "debian/control File Source Index"; + pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(TypeName.c_str()); + if(Type != NULL) + Last = Type->CreateSrcPkgParser(*I); + } + // if its a local file (e.g. .dsc) use this + else if (FileExists(*I)) + { + // see if we can get a parser for this pkgIndexFile type + string TypeName = flExtension(*I) + " File Source Index"; + pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(TypeName.c_str()); + if(Type != NULL) + Last = Type->CreateSrcPkgParser(*I); + } else { + // normal case, search the cache for the source file + Last = FindSrc(*I,Recs,SrcRecs,Src,Cache); + } + if (Last == 0) return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); @@ -1071,7 +1104,7 @@ static bool DoBuildDep(CommandLine &CmdL) } else if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); - + // Also ensure that build-essential packages are present Configuration::Item const *Opts = _config->Tree("APT::Build-Essential"); if (Opts) diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index 2c1107d90..b0edafcbd 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -43,7 +43,8 @@ static bool DoDownloadFile(CommandLine &CmdL) std::string hash; if (CmdL.FileSize() > 3) hash = CmdL.FileList[3]; - new pkgAcqFile(&Fetcher, download_uri, hash, 0, "desc", "short-desc", + // we use download_uri as descr and targetfile as short-descr + new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile, "dest-dir-ignored", targetfile); Fetcher.Run(); bool Failed = false; diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index b85c07c33..e4cdf6381 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -31,6 +31,7 @@ #include <string> #include <unistd.h> #include <cstdio> +#include <stdlib.h> #include <apti18n.h> /*}}}*/ @@ -56,6 +57,12 @@ static bool ShowHelp(CommandLine &) { return true; } /*}}}*/ +APT_NORETURN static void DIE(std::string const &message) { /*{{{*/ + std::cerr << "ERROR: " << message << std::endl; + _error->DumpErrors(std::cerr); + exit(EXIT_FAILURE); +} + /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { @@ -115,34 +122,29 @@ int main(int argc,const char *argv[]) /*{{{*/ EDSP::WriteProgress(0, "Start up solver…", output); - if (pkgInitSystem(*_config,_system) == false) { - std::cerr << "System could not be initialized!" << std::endl; - return 1; - } + if (pkgInitSystem(*_config,_system) == false) + DIE("System could not be initialized!"); EDSP::WriteProgress(1, "Read request…", output); if (WaitFd(input, false, 5) == false) - std::cerr << "WAIT timed out in the resolver" << std::endl; + DIE("WAIT timed out in the resolver"); std::list<std::string> install, remove; bool upgrade, distUpgrade, autoRemove; - if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false) { - std::cerr << "Parsing the request failed!" << std::endl; - return 2; - } + if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false) + DIE("Parsing the request failed!"); EDSP::WriteProgress(5, "Read scenario…", output); pkgCacheFile CacheFile; - CacheFile.Open(NULL, false); + if (CacheFile.Open(NULL, false) == false) + DIE("Failed to open CacheFile!"); EDSP::WriteProgress(50, "Apply request on scenario…", output); - if (EDSP::ApplyRequest(install, remove, CacheFile) == false) { - std::cerr << "Failed to apply request to depcache!" << std::endl; - return 3; - } + if (EDSP::ApplyRequest(install, remove, CacheFile) == false) + DIE("Failed to apply request to depcache!"); pkgProblemResolver Fix(CacheFile); for (std::list<std::string>::const_iterator i = remove.begin(); @@ -183,10 +185,8 @@ int main(int argc,const char *argv[]) /*{{{*/ EDSP::WriteProgress(95, "Write solution…", output); - if (EDSP::WriteSolution(CacheFile, output) == false) { - std::cerr << "Failed to output the solution!" << std::endl; - return 4; - } + if (EDSP::WriteSolution(CacheFile, output) == false) + DIE("Failed to output the solution!"); EDSP::WriteProgress(100, "Done", output); diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 72086af14..2cfdf8e8e 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -116,6 +116,7 @@ int main(int argc, const char *argv[]) /*{{{*/ _config->CndSet("DPkg::Progress-Fancy", "1"); _config->CndSet("Apt::Color", "1"); _config->CndSet("APT::Get::Upgrade-Allow-New", true); + _config->CndSet("APT::Cmd::Show-Update-Stats", true); // Parse the command line and initialize the package library CommandLine CmdL(Args.data(), _config); diff --git a/configure.ac b/configure.ac index a16055652..748dcfa63 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,10 @@ dnl code more portable dnl You MUST have an environment that has all the POSIX functions and dnl some of the more popular bsd/sysv ones (like select). You'll also -dnl need a C++ compiler that is semi-standard conformant, exceptions are +dnl need a C++ compiler that is semi-standard conformant, exceptions are dnl not used but STL is. -dnl 'make -f Makefile startup' will generate the configure file from +dnl 'make -f Makefile startup' will generate the configure file from dnl configure.ac correctly and can be run at any time AC_PREREQ(2.50) @@ -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) PACKAGE="apt" -PACKAGE_VERSION="1.0.3" +PACKAGE_VERSION="1.0.4" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") @@ -53,7 +53,7 @@ AC_SEARCH_LIBS(connect,socket) SOCKETLIBS="$LIBS" AC_SUBST(SOCKETLIBS) LIBS="$SAVE_LIBS" - + dnl Checks for pthread -- disabled due to glibc bugs jgg dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) AC_SUBST(PTHREADLIB) @@ -89,6 +89,13 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_MSG_ERROR([failed: I need CURL due https support]), ) +AC_LANG_PUSH([C++]) +AC_CHECK_HEADER(gtest/gtest.h,, + AC_MSG_ERROR([failed: I need gtest to build tests]), +) +AC_LANG_POP([C++]) + + AC_SUBST(BDBLIB) HAVE_ZLIB=no @@ -160,7 +167,7 @@ dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno AC_MSG_CHECKING(for h_errno) AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - AC_EGREP_HEADER(h_errno, netdb.h, + AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], [AC_MSG_ERROR("not found.")]) ]) diff --git a/debian/changelog b/debian/changelog index 57fa52f29..193977d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +apt (1.1~exp1) UNRELEASED; urgency=low + + [ Michael Vogt ] + * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: + - fix invalid InRelease file download checking and add regression + test to server broken files to the buildin test webserver + * stop exporting the accidently exported parsenetrc() symbol + * [ABI-Break] lp:~mvo/apt/source-hashes: + - use sha{512,256,1} for deb-src when available LP: #1098738 + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 07 May 2014 17:48:24 +0200 + +apt (1.0.4) unstable; urgency=low + + [ Michael Vogt ] + * Implement CacheDB for source packages in apt-ftparchive + * apt-private/acqprogress.cc: reset color in apt update + * Show progress in run-tests + * Never parse Version/Architecture tags in a Translation-$lang file + * Show upgradable packages after apt update (Closes: 748389) + * Fix various errors found by clang -fsanitize=address + * Fix various errors foudn by clang scan-build + * Show unauthenticated warning for source packages as well (Closes: #749795) + * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466) + * cmdline/apt-helper.cc: use less generic description/short-description + in apt-helper download + * add pkgSrcRecords::Step() to step through all the pkgSrcRecords + (thanks to Helmut Grohne) + + [ David Kalnischkies ] + * initialize Verify in second pkgAcqIndex constructor + * consistently fail if Smart* packagemanager actions fail + * fix tight loop detection and temporary removes + * if Resolver fails, do not continue even if not broken + * check exit status of external solvers + * do not revert candidate for protected packages (Closes: 745046) + * support Acquire::GzipIndexes in dumpavail (Closes: 742835) + + [ Stefano Zacchiroli ] + * EDSP doc: fix typo in Request stanza description + * EDSP: bump protocol version to 0.5 + * EDSP: add Architecture(s) multi-arch fields to the Request stanza + * EDSP: add Source field to Package stanzas + * EDSP: add APT-Release field to Package stanzas + + [ Sebastian Schmidt ] + * fix screen width detection for apt/apt-get lists (Closes: 748430, 747942) + + [ Milo Casagrande ] + * Italian program translation update (Closes: 750009) + + -- Michael Vogt <mvo@debian.org> Tue, 10 Jun 2014 14:55:05 +0200 + apt (1.0.3) unstable; urgency=medium [ Michael Vogt ] diff --git a/debian/control b/debian/control index ff984db75..4c795cf30 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Description: commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys -Package: libapt-pkg4.12 +Package: libapt-pkg4.13 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 35cce919f..8ce707287 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -88,4 +88,4 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 -### + (c++|optional=std)"std::ctype<char>::do_widen(char) const@Base" 1.0.3 diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.13.install.in index 56bed39d3..56bed39d3 100644 --- a/debian/libapt-pkg4.12.install.in +++ b/debian/libapt-pkg4.13.install.in diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.13.symbols index 5d7b21f10..13b063d76 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.13.symbols @@ -1,4 +1,4 @@ -libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# +libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER# * Build-Depends-Package: libapt-pkg-dev TFRewritePackageOrder@Base 0.8.0 TFRewriteSourceOrder@Base 0.8.0 @@ -181,7 +181,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgRecords::Parser::ShortDesc()@Base" 0.8.0 (c++)"pkgRecords::Parser::SourcePkg()@Base" 0.8.0 (c++)"pkgRecords::Parser::SourceVer()@Base" 0.8.0 - (c++)"pkgRecords::Parser::~Parser()@Base" 0.8.0 (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0 (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0 (c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0 @@ -315,8 +314,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgIndexFile::Type::GlobalListLen@Base" 0.8.0 (c++)"pkgIndexFile::Type::GetType(char const*)@Base" 0.8.0 (c++)"pkgIndexFile::Type::Type()@Base" 0.8.0 - (c++)"pkgIndexFile::Type::~Type()@Base" 0.8.0 - (c++)"pkgIndexFile::~pkgIndexFile()@Base" 0.8.0 (c++)"pkgOrderList::VisitRDeps(bool (pkgOrderList::*)(pkgCache::DepIterator), pkgCache::PkgIterator)@Base" 0.8.0 (c++)"pkgOrderList::OrderUnpack(std::basic_string<char, std::char_traits<char>, std::allocator<char> >*)@Base" 0.8.0 (c++)"pkgOrderList::DepConfigure(pkgCache::DepIterator)@Base" 0.8.0 @@ -402,7 +399,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgSourceList::Type::GlobalListLen@Base" 0.8.0 (c++)"pkgSourceList::Type::GetType(char const*)@Base" 0.8.0 (c++)"pkgSourceList::Type::Type()@Base" 0.8.0 - (c++)"pkgSourceList::Type::~Type()@Base" 0.8.0 (c++)"pkgSourceList::Reset()@Base" 0.8.0 (c++)"pkgSourceList::pkgSourceList(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0 (c++)"pkgSourceList::pkgSourceList()@Base" 0.8.0 @@ -411,7 +407,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgSrcRecords::Find(char const*, bool const&)@Base" 0.8.0 (c++)"pkgSrcRecords::Parser::BuildDepRec::~BuildDepRec()@Base" 0.8.0 (c++)"pkgSrcRecords::Parser::BuildDepType(unsigned char const&)@Base" 0.8.0 - (c++)"pkgSrcRecords::Parser::~Parser()@Base" 0.8.0 (c++)"pkgSrcRecords::Restart()@Base" 0.8.0 (c++)"pkgSrcRecords::pkgSrcRecords(pkgSourceList&)@Base" 0.8.0 (c++)"pkgSrcRecords::~pkgSrcRecords()@Base" 0.8.0 @@ -457,7 +452,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0 (c++)"debReleaseIndex::~debReleaseIndex()@Base" 0.8.0 (c++)"debSLTypeDebSrc::~debSLTypeDebSrc()@Base" 0.8.0 - (c++)"debSLTypeDebian::~debSLTypeDebian()@Base" 0.8.0 (c++)"debSourcesIndex::debSourcesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0 (c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0 (c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0 @@ -503,13 +497,11 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgAcquireStatus::Start()@Base" 0.8.0 (c++)"pkgAcquireStatus::IMSHit(pkgAcquire::ItemDesc&)@Base" 0.8.0 (c++)"pkgAcquireStatus::pkgAcquireStatus()@Base" 0.8.0 - (c++)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0 (c++)"PreferenceSection::TrimRecord(bool, char const*&)@Base" 0.8.0 (c++)"pkgArchiveCleaner::Go(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgCache&)@Base" 0.8.0 (c++)"pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned int)@Base" 0.8.0 (c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::SelectFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0 @@ -586,7 +578,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgVersioningSystem::TestCompatibility(pkgVersioningSystem const&)@Base" 0.8.0 (c++)"pkgVersioningSystem::GetVS(char const*)@Base" 0.8.0 (c++)"pkgVersioningSystem::pkgVersioningSystem()@Base" 0.8.0 - (c++)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0 (c++)"debTranslationsIndex::debTranslationsIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, char const*)@Base" 0.8.0 (c++)"debTranslationsIndex::~debTranslationsIndex()@Base" 0.8.0 (c++)"APT::CacheFilter::PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0 @@ -671,7 +662,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"IndexCopy::ConvertToSourceList(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0 (c++)"IndexCopy::ChopDirs(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int)@Base" 0.8.0 (c++)"IndexCopy::GrabFirst(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int)@Base" 0.8.0 - (c++)"IndexCopy::~IndexCopy()@Base" 0.8.0 (c++)"SigVerify::CopyAndVerify(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >)@Base" 0.8.0 (c++)"SigVerify::CopyMetaIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0 (c++)"SigVerify::Verify(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, indexRecords*)@Base" 0.8.0 @@ -685,7 +675,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"debSystem::UnLock(bool)@Base" 0.8.0 (c++)"debSystem::debSystem()@Base" 0.8.0 (c++)"debSystem::~debSystem()@Base" 0.8.0 - (c++)"metaIndex::~metaIndex()@Base" 0.8.0 (c++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0 (c++)"pkgDPkgPM::DoTerminalPty(int)@Base" 0.8.0 (c++)"pkgDPkgPM::WriteHistoryTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0 @@ -716,7 +705,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgSystem::Score(Configuration const&)@Base" 0.8.0 (c++)"pkgSystem::GetSystem(char const*)@Base" 0.8.0 (c++)"pkgSystem::pkgSystem()@Base" 0.8.0 - (c++)"pkgSystem::~pkgSystem()@Base" 0.8.0 (c++)"HashString::VerifyFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0 (c++)"HashString::empty() const@Base" 0.8.0 (c++)"HashString::toStr() const@Base" 0.8.0 @@ -1448,7 +1436,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# ### rework of the packagemanager rework (c++)"APT::Progress::PackageManager::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManagerFancy::GetNumberTerminalRows()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::HandleSIGWINCH(int)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 @@ -1579,13 +1566,40 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&)@Base" 0.9.16 (c++)"pkgCacheGenerator::ListParser::SameVersion(unsigned short, pkgCache::VerIterator const&)@Base" 0.9.16 (c++)"Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.16 + (c++)"pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 1.0 + (c++)"APT::Progress::PackageManagerFancy::GetTerminalSize()@Base" 1.0 + (c++)"APT::Progress::PackageManagerFancy::GetTextProgressStr(float, int)@Base" 1.0 + (c++)"pkgCdromStatus::GetOpProgress()@Base" 1.0 + (c++)"pkgCdromStatus::SetTotal(int)@Base" 1.0 + (c++)"EDSP::ExecuteSolver(char const*, int*, int*, bool)@Base" 1.0.4 + (c++)"pkgPackageManager::EarlyRemove(pkgCache::PkgIterator, pkgCache::DepIterator const*)@Base" 1.0.4 + (c++)"debTranslationsParser::Architecture()@Base" 1.0.4 + (c++)"debTranslationsParser::~debTranslationsParser()@Base" 1.0.4 + (c++)"debTranslationsParser::Version()@Base" 1.0.4 + (c++)"typeinfo for debTranslationsParser@Base" 1.0.4 + (c++)"typeinfo name for debTranslationsParser@Base" 1.0.4 + (c++)"vtable for debTranslationsParser@Base" 1.0.4 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0 ### gcc-4.6 artefacts - (c++|optional=implicit)"HashString::operator=(HashString const&)@Base" 0.8.0 - (c++|optional=implicit)"HashString::HashString(HashString const&)@Base" 0.8.0 - (c++|optional=inline)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator std::max_element<APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders>(APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders)@Base" 0.8.0 - (c++|optional=inline)"pkgCache::VerIterator::ParentPkg() const@Base" 0.8.0 +# (c++|optional=implicit)"HashString::operator=(HashString const&)@Base" 0.8.0 +# (c++|optional=implicit)"HashString::HashString(HashString const&)@Base" 0.8.0 +# (c++|optional=inline)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator std::max_element<APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders>(APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders)@Base" 0.8.0 +# (c++|optional=inline)"pkgCache::VerIterator::ParentPkg() const@Base" 0.8.0 +### gcc-4.8 artefacts +# (c++|optional=implicit)"debSLTypeDebian::~debSLTypeDebian()@Base" 0.8.0 +### empty destructors included in the .h file +# (c++|optional=inline)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0 +# (c++|optional=inline)"pkgSystem::~pkgSystem()@Base" 0.8.0 +# (c++|optional=inline)"pkgRecords::Parser::~Parser()@Base" 0.8.0 +# (c++|optional=inline)"pkgSrcRecords::Parser::~Parser()@Base" 0.8.0 +# (c++|optional=inline)"pkgIndexFile::Type::~Type()@Base" 0.8.0 +# (c++|optional=inline)"pkgSourceList::Type::~Type()@Base" 0.8.0 +# (c++|optional=inline)"pkgIndexFile::~pkgIndexFile()@Base" 0.8.0 +# (c++|optional=inline)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 +# (c++|optional=inline)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0 +# (c++|optional=inline)"metaIndex::~metaIndex()@Base" 0.8.0 +# (c++|optional=inline)"IndexCopy::~IndexCopy()@Base" 0.8.0 ### std library artefacts (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0 (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 @@ -1593,15 +1607,13 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<char const*>(char const*, char const*, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0 - (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_dispatch<unsigned char*>(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 - (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::basic_string<.+ >::basic_string<.+>\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 + (c++|optional=std)"std::ctype<char>::do_widen(char) const@Base" 1.0.3 diff --git a/debian/tests/control b/debian/tests/control index 209f16bfd..72e9deef7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev +Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev, db-util diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e6bc5e0d1..308031e9d 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -12,6 +12,7 @@ make -C test/interactive-helper/ APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ +APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index ffd7c88b9..6ca8d1189 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,112 +1,129 @@ -# Doxyfile 1.8.4 +# Doxyfile 1.8.7 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. # -# All text after a double hash (##) is considered a comment and is placed -# in front of the TAG it is preceding . -# All text after a hash (#) is considered a comment and will be ignored. +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. # The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" "). +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- # This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or sequence of words) that should -# identify the project. Note that if you do not use Doxywizard you need -# to put quotes around the project name if it contains spaces. +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. PROJECT_NAME = @PACKAGE@ -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. PROJECT_NUMBER = @PACKAGE_VERSION@ # Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer -# a quick idea about the purpose of the project. Keep the description short. +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. PROJECT_BRIEF = "commandline package manager" -# With the PROJECT_LOGO tag one can specify an logo or icon that is -# included in the documentation. The maximum height of the logo should not -# exceed 55 pixels and the maximum width should not exceed 200 pixels. -# Doxygen will copy the logo to the output directory. +# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# the documentation. The maximum height of the logo should not exceed 55 pixels +# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo +# to the output directory. PROJECT_LOGO = -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. OUTPUT_DIRECTORY = ../build/doc/doxygen -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. CREATE_SUBDIRS = NO +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian, -# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, -# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. +# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. +# The default value is: YES. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. ABBREVIATE_BRIEF = # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# doxygen will generate a detailed section even if there is only a brief # description. +# The default value is: NO. ALWAYS_DETAILED_SEC = NO @@ -114,143 +131,165 @@ ALWAYS_DETAILED_SEC = NO # inherited members of a class in the documentation of that class as if those # members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. +# The default value is: NO. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. +# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. Note that you specify absolute paths here, but also -# relative paths, which will be relative from the directory where doxygen is -# started. +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful if your file system -# doesn't support long names like on DOS, Mac, or CD-ROM. +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a +# new page for each member. If set to NO, the documentation of a member will be +# part of the file/class/namespace that contains it. +# The default value is: NO. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. ALIASES = "TODO=\todo" # This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding -# "class=itcl::class" will allow you to use the command class in the -# itcl::class meaning. +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. TCL_SUBST = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. OPTIMIZE_OUTPUT_JAVA = NO # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. OPTIMIZE_FOR_FORTRAN = NO # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. OPTIMIZE_OUTPUT_VHDL = NO # Doxygen selects the parser to use depending on the extension of the files it # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, -# and language is one of the parsers supported by doxygen: IDL, Java, -# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, -# C++. For instance to make doxygen treat .inc files as Fortran files (default -# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note -# that for custom extensions you also need to set FILE_PATTERNS otherwise the -# files are not read by doxygen. +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. EXTENSION_MAPPING = -# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all -# comments according to the Markdown format, which allows for more readable +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable # documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you -# can mix doxygen, HTML, and XML commands with Markdown formatting. -# Disable only in case of backward compatibilities issues. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. MARKDOWN_SUPPORT = YES @@ -258,35 +297,41 @@ MARKDOWN_SUPPORT = YES # classes, or namespaces to their corresponding documentation. Such a link can # be prevented in individual cases by by putting a % sign in front of the word # or globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. AUTOLINK_SUPPORT = YES # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also makes the inheritance and collaboration +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. +# The default value is: NO. BUILTIN_STL_SUPPORT = YES # If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. +# The default value is: NO. CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. SIP_SUPPORT = NO # For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES (the -# default) will make doxygen replace the get and set methods by a property in -# the documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. IDL_PROPERTY_SUPPORT = YES @@ -294,51 +339,61 @@ IDL_PROPERTY_SUPPORT = YES # tag is set to YES, then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. +# The default value is: NO. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. SUBGROUPING = YES -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and -# unions are shown inside the group in which they are included (e.g. using -# @ingroup) instead of on a separate page (for HTML and Man pages) or -# section (for LaTeX and RTF). +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. INLINE_GROUPED_CLASSES = NO -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields or simple typedef fields will be shown -# inline in the documentation of the scope in which they are defined (i.e. file, +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, # namespace, or group documentation), provided this scope is documented. If set -# to NO (the default), structs, classes, and unions are shown on a separate -# page (for HTML and Man pages) or section (for LaTeX and RTF). +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. INLINE_SIMPLE_STRUCTS = NO -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct # with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound # types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. TYPEDEF_HIDES_STRUCT = NO # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can -# be an expensive process and often the same symbol appear multiple times in -# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too -# small doxygen will become slower. If the cache is too large, memory is wasted. -# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid -# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536 -# symbols. +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. LOOKUP_CACHE_SIZE = 0 @@ -347,343 +402,391 @@ LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# be included in the documentation. +# The default value is: NO. EXTRACT_PRIVATE = NO # If the EXTRACT_PACKAGE tag is set to YES all members with package or internal # scope will be included in the documentation. +# The default value is: NO. EXTRACT_PACKAGE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. +# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# included in the documentation. +# The default value is: NO. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. +# This flag is only useful for Objective-C code. When set to YES local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO only methods in the interface are +# included. +# The default value is: NO. EXTRACT_LOCAL_METHODS = NO # If this flag is set to YES, the members of anonymous namespaces will be # extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespaces are hidden. +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO these classes will be included in the various overviews. This option has +# no effect if EXTRACT_ALL is enabled. +# The default value is: NO. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO these declarations will be +# included in the documentation. +# The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. +# The default value is: system dependent. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES the +# scope will be hidden. +# The default value is: NO. HIDE_SCOPE_NAMES = YES -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. SHOW_INCLUDE_FILES = YES -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. FORCE_LOCAL_INCLUDES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: YES. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. SORT_BRIEF_DOCS = NO -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. SORT_MEMBERS_CTORS_1ST = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. SORT_GROUP_NAMES = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. SORT_BY_SCOPE_NAME = NO -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to -# do proper type resolution of all parameters of a function it will reject a -# match between the prototype and the implementation of a member function even -# if there is only one candidate or it is obvious which candidate to choose -# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen -# will still accept a match between prototype and implementation in such cases. +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. STRICT_PROTO_MATCHING = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. +# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the +# todo list. This list is created by putting \todo commands in the +# documentation. +# The default value is: YES. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. +# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the +# test list. This list is created by putting \test commands in the +# documentation. +# The default value is: YES. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. +# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. +# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if section-label ... \endif -# and \cond section-label ... \endcond blocks. +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or macro consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and macros in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES the list +# will mention the files that were used to generate the documentation. +# The default value is: YES. SHOW_USED_FILES = YES -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. SHOW_FILES = YES -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command <command> <input-file>, where <command> is the value of -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated # output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. LAYOUT_FILE = -# The CITE_BIB_FILES tag can be used to specify one or more bib files -# containing the references data. This must be a list of .bib files. The -# .bib extension is automatically appended if omitted. Using this command -# requires the bibtex tool to be installed. See also -# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style -# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this -# feature you need bibtex and perl available in the search path. Do not use -# file names with spaces, bibtex cannot handle them. +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. Do not use file names with spaces, bibtex cannot handle them. See +# also \cite for info how to create references. CITE_BIB_FILES = #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# Configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. QUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. +# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. +# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. WARN_IF_UNDOCUMENTED = NO -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. WARN_IF_DOC_ERROR = YES -# The WARN_NO_PARAMDOC option can be enabled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO doxygen will only warn about wrong or incomplete parameter +# documentation, but not about the absence of documentation. +# The default value is: NO. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. INPUT = ../apt-pkg # This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py -# *.f90 *.f *.for *.vhd *.vhdl +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. FILE_PATTERNS = *.cc \ *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# # Note that relative paths are relative to the directory from which doxygen is # run. @@ -692,14 +795,16 @@ EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded # from the input. +# The default value is: NO. EXCLUDE_SYMLINKS = NO # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* EXCLUDE_PATTERNS = @@ -708,42 +813,49 @@ EXCLUDE_PATTERNS = # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. EXAMPLE_PATTERNS = # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be ignored. +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# # Note that the filter must not add or remove lines; it is applied before the # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. @@ -751,172 +863,222 @@ IMAGE_PATH = INPUT_FILTER = "sed -e 's#//[ ]*FIXME:\?#/// \\todo#'" # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty or if -# non of the patterns match the file name, INPUT_FILTER is applied. +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). +# INPUT_FILTER ) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. FILTER_SOURCE_FILES = NO # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) -# and it is also possible to disable source filtering for a specific pattern -# using *.ext= (so without naming a filter). This option only has effect when -# FILTER_SOURCE_FILES is enabled. +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. FILTER_SOURCE_PATTERNS = -# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that # is part of the input, its contents will be placed on the main page # (index.html). This can be useful if you have a project on for instance GitHub -# and want reuse the introduction page also for the doxygen output. +# and want to reuse the introduction page also for the doxygen output. USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- -# configuration options related to source browsing +# Configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C, C++ and Fortran comments will always remain visible. +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. REFERENCES_RELATION = YES -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. +# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# The default value is: YES. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FILE_EXTENSION = .xhtml -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. Note that when using a custom header you are responsible -# for the proper inclusion of any scripts and style sheets that doxygen -# needs, which is dependent on the configuration options used. -# It is advised to generate a default header using "doxygen -w html -# header.html footer.html stylesheet.css YourConfigFile" and then modify -# that header. Note that the header is subject to change so you typically -# have to redo this when upgrading to a newer version of doxygen or when -# changing the value of configuration settings such as GENERATE_TREEVIEW! +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If left blank doxygen will -# generate a default style sheet. Note that it is recommended to use -# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this -# tag will in the future become obsolete. +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_STYLESHEET = -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional -# user-defined cascading style sheet that is included after the standard -# style sheets created by doxygen. Using this option one can overrule -# certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more -# robust against future updates. Doxygen will copy the style sheet file to -# the output directory. +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- +# defined cascading style sheet that is included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefor more robust against future updates. +# Doxygen will copy the style sheet file to the output directory. For an example +# see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -924,632 +1086,803 @@ HTML_EXTRA_STYLESHEET = # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the # $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that -# the files will be copied as-is; there are no commands or markers available. +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_FILES = -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the style sheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the stylesheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_HUE = 220 -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_SAT = 100 -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_COLORSTYLE_GAMMA = 80 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_DYNAMIC_SECTIONS = NO -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of -# entries shown in the various tree structured indices initially; the user -# can expand and collapse entries dynamically later on. Doxygen will expand -# the tree to such a level that at most the specified number of entries are -# visible (unless a fully collapsed tree already exceeds this amount). -# So setting the number of entries 1 will produce a full collapsed tree by -# default. 0 is a special value representing an infinite number of entries -# and will result in a full expanded tree by default. +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. HTML_INDEX_NUM_ENTRIES = 100 -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_DOCSET = NO -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_FEEDNAME = "Doxygen generated docs" -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_BUNDLE_ID = org.doxygen.Project -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely -# identify the documentation publisher. This should be a reverse domain-name -# style string, e.g. com.mycompany.MyDocSet.documentation. +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_ID = org.doxygen.Publisher -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. DOCSET_PUBLISHER_NAME = Publisher -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be # written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# The GENERATE_CHI flag controls if a separate .chi index file is generated ( +# YES) or that it should be included in the master .chm file ( NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. CHM_INDEX_ENCODING = -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. +# The BINARY_TOC flag controls whether a binary table of contents is generated ( +# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. TOC_EXPAND = NO # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_QHP = NO -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. QCH_FILE = -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_NAMESPACE = -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> -# Qt Help Project / Custom Filters</a>. +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> -# Qt Help Project / Filter Attributes</a>. +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. QHG_LOCATION = -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_ECLIPSEHELP = NO -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. ECLIPSE_DOC_ID = org.doxygen.Project -# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) -# at top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. Since the tabs have the same information as the -# navigation tree you can set this option to NO if you already set -# GENERATE_TREEVIEW to YES. +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. DISABLE_INDEX = NO # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. -# Since the tree basically has the same information as the tab index you -# could consider to set DISABLE_INDEX to NO when enabling this option. +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. GENERATE_TREEVIEW = NO -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values -# (range [0,1..20]) that doxygen will group on one line in the generated HTML -# documentation. Note that a value of 0 will completely suppress the enum -# values from appearing in the overview section. +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. ENUM_VALUES_PER_LINE = 4 -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. TREEVIEW_WIDTH = 250 -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. EXT_LINKS_IN_WINDOW = NO -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_FONTSIZE = 10 # Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. FORMULA_TRANSPARENT = YES -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax -# (see http://www.mathjax.org) which uses client side Javascript for the -# rendering instead of using prerendered bitmaps. Use this if you do not -# have LaTeX installed or if you want to formulas look prettier in the HTML -# output. When enabled you may also need to install MathJax separately and -# configure the path to it using the MATHJAX_RELPATH option. +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. USE_MATHJAX = NO # When MathJax is enabled you can set the default output format to be used for -# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and -# SVG. The default value is HTML-CSS, which is slower, but has the best -# compatibility. +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_FORMAT = HTML-CSS -# When MathJax is enabled you need to specify the location relative to the -# HTML output directory using the MATHJAX_RELPATH option. The destination -# directory should contain the MathJax.js script. For instance, if the mathjax -# directory is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to -# the MathJax Content Delivery Network so you can quickly see the result without -# installing MathJax. -# However, it is strongly recommended to install a local -# copy of MathJax from http://www.mathjax.org before deployment. +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest -# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension -# names that should be enabled during MathJax rendering. +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_EXTENSIONS = -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript -# pieces of code that will be used on startup of the MathJax code. +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_CODEFILE = -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use <access key> + S +# (what the <access key> is depends on the OS and browser, but it is typically +# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down +# key> to jump into the search results window, the results can be navigated +# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel +# the search. The filter options can be selected when the cursor is inside the +# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys> +# to select a filter and <Enter> or <escape> to activate or cancel the filter +# option. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. SEARCHENGINE = NO # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. -# There are two flavours of web server based search depending on the -# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for -# searching and an index file used by the script. When EXTERNAL_SEARCH is -# enabled the indexing and searching needs to be provided by external tools. -# See the manual for details. +# implemented using a web server instead of a web client using Javascript. There +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. SERVER_BASED_SEARCH = NO -# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP +# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP # script for searching. Instead the search results are written to an XML file # which needs to be processed by an external indexer. Doxygen will invoke an -# external search engine pointed to by the SEARCHENGINE_URL option to obtain -# the search results. Doxygen ships with an example indexer (doxyindexer) and -# search engine (doxysearch.cgi) which are based on the open source search -# engine library Xapian. See the manual for configuration details. +# external search engine pointed to by the SEARCHENGINE_URL option to obtain the +# search results. +# +# Doxygen ships with an example indexer ( doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). +# +# See the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. EXTERNAL_SEARCH = NO # The SEARCHENGINE_URL should point to a search engine hosted by a web server -# which will returned the search results when EXTERNAL_SEARCH is enabled. -# Doxygen ships with an example search engine (doxysearch) which is based on -# the open source search engine library Xapian. See the manual for configuration -# details. +# which will return the search results when EXTERNAL_SEARCH is enabled. +# +# Doxygen ships with an example indexer ( doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Searching" for details. +# This tag requires that the tag SEARCHENGINE is set to YES. SEARCHENGINE_URL = # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed # search data is written to a file for indexing by an external tool. With the # SEARCHDATA_FILE tag the name of this file can be specified. +# The default file is: searchdata.xml. +# This tag requires that the tag SEARCHENGINE is set to YES. SEARCHDATA_FILE = searchdata.xml -# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the # EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is # useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple # projects and redirect the results back to the right project. +# This tag requires that the tag SEARCHENGINE is set to YES. EXTERNAL_SEARCH_ID = # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen # projects other than the one defined by this configuration file, but that are # all added to the same external search index. Each project needs to have a -# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id -# of to a relative location where the documentation can be found. -# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of +# to a relative location where the documentation can be found. The format is: +# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# This tag requires that the tag SEARCHENGINE is set to YES. EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- -# configuration options related to the LaTeX output +# Configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. +# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output. +# The default value is: YES. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. +# invoked. +# +# Note that when enabling USE_PDFLATEX this option is only used for generating +# bitmaps for formulas in the HTML output, but not in the Makefile that is +# written to the output directory. +# The default file is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate +# index for LaTeX. +# The default file is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. +# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, letter, legal and -# executive. If left blank a4 will be used. +# The PAPER_TYPE tag can be used to set the paper type that is used by the +# printer. +# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x +# 14 inches) and executive (7.25 x 10.5 inches). +# The default value is: a4. +# This tag requires that the tag GENERATE_LATEX is set to YES. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. +# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names +# that should be included in the LaTeX output. To get the times font for +# instance you can specify +# EXTRA_PACKAGES=times +# If left blank no extra packages will be included. +# This tag requires that the tag GENERATE_LATEX is set to YES. EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the +# generated LaTeX document. The header should contain everything until the first +# chapter. If it is left blank doxygen will generate a standard header. See +# section "Doxygen usage" for information on how to let doxygen write the +# default header to a separate file. +# +# Note: Only use a user-defined header if you know what you are doing! The +# following commands have a special meaning inside the header: $title, +# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will +# replace them by respectively the title of the page, the current date and time, +# only the current date, the version number of doxygen, the project name (see +# PROJECT_NAME), or the project number (see PROJECT_NUMBER). +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_HEADER = -# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for -# the generated latex document. The footer should contain everything after -# the last chapter. If it is left blank doxygen will generate a -# standard footer. Notice: only use this tag if you know what you are doing! +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the +# generated LaTeX document. The footer should contain everything after the last +# chapter. If it is left blank doxygen will generate a standard footer. +# +# Note: Only use a user-defined footer if you know what you are doing! +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_FOOTER = -# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images -# or other source files which should be copied to the LaTeX output directory. -# Note that the files will be copied as-is; there are no commands or markers -# available. +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the LATEX_OUTPUT output +# directory. Note that the files will be copied as-is; there are no commands or +# markers available. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_EXTRA_FILES = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is +# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will +# contain links (just like the HTML output) instead of page references. This +# makes the output suitable for online browsing using a PDF viewer. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES to get a # higher quality PDF documentation. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode +# command to the generated LaTeX files. This will instruct LaTeX to keep running +# if errors occur, instead of asking the user for help. This option is also used +# when generating formulas in HTML. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. +# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the +# index chapters (such as File Index, Compound Index, etc.) in the output. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_HIDE_INDICES = NO -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. +# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source +# code with syntax highlighting in the LaTeX output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the -# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See -# http://en.wikipedia.org/wiki/BibTeX for more info. +# bibliography, e.g. plainnat, or ieeetr. See +# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# The default value is: plain. +# This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- -# configuration options related to the RTF output +# Configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. +# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The +# RTF output is optimized for Word 97 and may not look too pretty with other RTF +# readers/editors. +# The default value is: NO. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: rtf. +# This tag requires that the tag GENERATE_RTF is set to YES. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. +# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will +# contain hyperlink fields. The RTF file will contain links (just like the HTML +# output) instead of page references. This makes the output suitable for online +# browsing using Word or some other Word compatible readers that support those +# fields. +# +# Note: WordPad (write) and others do not support links. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. RTF_HYPERLINKS = NO -# Load style sheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. +# Load stylesheet definitions from file. Syntax is similar to doxygen's config +# file, i.e. a series of assignments. You only have to provide replacements, +# missing definitions are set to their default value. +# +# See also section "Doxygen usage" for information on how to generate the +# default style sheet that doxygen normally uses. +# This tag requires that the tag GENERATE_RTF is set to YES. RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. +# Set optional variables used in the generation of an RTF document. Syntax is +# similar to doxygen's config file. A template extensions file can be generated +# using doxygen -e rtf extensionFile. +# This tag requires that the tag GENERATE_RTF is set to YES. RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- -# configuration options related to the man page output +# Configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages +# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for +# classes and files. +# The default value is: NO. GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. A directory man3 will be created inside the directory specified by +# MAN_OUTPUT. +# The default directory is: man. +# This tag requires that the tag GENERATE_MAN is set to YES. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) +# The MAN_EXTENSION tag determines the extension that is added to the generated +# man pages. In case the manual section does not start with a number, the number +# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is +# optional. +# The default value is: .3. +# This tag requires that the tag GENERATE_MAN is set to YES. MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + +# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without +# them the man command would be unable to find the correct page. +# The default value is: NO. +# This tag requires that the tag GENERATE_MAN is set to YES. MAN_LINKS = NO #--------------------------------------------------------------------------- -# configuration options related to the XML output +# Configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. +# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that +# captures the structure of the code including all documentation. +# The default value is: NO. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. +# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: xml. +# This tag requires that the tag GENERATE_XML is set to YES. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. +# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program +# listings (including syntax highlighting and cross-referencing information) to +# the XML output. Note that enabling this will significantly increase the size +# of the XML output. +# The default value is: YES. +# This tag requires that the tag GENERATE_XML is set to YES. XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- -# configuration options related to the DOCBOOK output +# Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- -# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files +# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files # that can be used to generate PDF. +# The default value is: NO. GENERATE_DOCBOOK = NO -# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put. +# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in -# front of it. If left blank docbook will be used as the default path. +# front of it. +# The default directory is: docbook. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. DOCBOOK_OUTPUT = docbook #--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output +# Configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. +# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen +# Definitions (see http://autogen.sf.net) file that captures the structure of +# the code including all documentation. Note that this feature is still +# experimental and incomplete at the moment. +# The default value is: NO. GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- -# configuration options related to the Perl module output +# Configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. +# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module +# file that captures the structure of the code including all documentation. +# +# Note that this feature is still experimental and incomplete at the moment. +# The default value is: NO. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. +# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary +# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI +# output from the Perl module output. +# The default value is: NO. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely +# formatted so it can be parsed by a human reader. This is useful if you want to +# understand what is going on. On the other hand, if this tag is set to NO the +# size of the Perl module output will be much smaller and Perl will parse it +# just the same. +# The default value is: YES. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. +# The names of the make variables in the generated doxyrules.make file are +# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful +# so different doxyrules.make files included by the same Makefile don't +# overwrite each other's variables. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. PERLMOD_MAKEVAR_PREFIX = @@ -1557,112 +1890,128 @@ PERLMOD_MAKEVAR_PREFIX = # Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. +# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all +# C-preprocessor directives found in the sources and include files. +# The default value is: YES. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. +# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names +# in the source code. If set to NO only conditional compilation will be +# performed. Macro expansion can be done in a controlled way by setting +# EXPAND_ONLY_PREDEF to YES. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then +# the macro expansion is limited to the macros specified with the PREDEFINED and +# EXPAND_AS_DEFINED tags. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# pointed to by INCLUDE_PATH will be searched when a #include is found. +# If the SEARCH_INCLUDES tag is set to YES the includes files in the +# INCLUDE_PATH will be searched if a #include is found. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. +# contain include files that are not input files but should be processed by the +# preprocessor. +# This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. +# directories. If left blank, the patterns specified with FILE_PATTERNS will be +# used. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. +# The PREDEFINED tag can be used to specify one or more macro names that are +# defined before the preprocessor is started (similar to the -D option of e.g. +# gcc). The argument of the tag is a list of macros of the form: name or +# name=definition (no spaces). If the definition and the "=" are omitted, "=1" +# is assumed. To prevent a macro definition from being undefined via #undef or +# recursively expanded use the := operator instead of the = operator. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition that -# overrules the definition found in the source code. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this +# tag can be used to specify a list of macro names that should be expanded. The +# macro definition that is found in the sources will be used. Use the PREDEFINED +# tag if you want to use a different macro definition that overrules the +# definition found in the source code. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all references to function-like macros -# that are alone on a line, have an all uppercase name, and do not end with a -# semicolon, because these will confuse the parser if not removed. +# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not +# removed. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration options related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. For each -# tag file the location of the external documentation should be added. The -# format of a tag file without this location is as follows: -# +# The TAGFILES tag can be used to specify one or more tag files. For each tag +# file the location of the external documentation should be added. The format of +# a tag file without this location is as follows: # TAGFILES = file1 file2 ... # Adding location for the tag files is done as follows: -# # TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths -# or URLs. Note that each tag file must have a unique name (where the name does -# NOT include the path). If a tag file is not located in the directory in which -# doxygen is run, you must also specify the path to the tagfile here. +# where loc1 and loc2 can be relative or absolute paths or URLs. See the +# section "Linking to external documentation" for more information about the use +# of tag files. +# Note: Each tag file must have a unique name (where the name does NOT include +# the path). If a tag file is not located in the directory in which doxygen is +# run, you must also specify the path to the tagfile here. TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. +# When a file name is specified after GENERATE_TAGFILE, doxygen will create a +# tag file that is based on the input files it reads. See section "Linking to +# external documentation" for more information about the usage of tag files. GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. +# If the ALLEXTERNALS tag is set to YES all external class will be listed in the +# class index. If set to NO only the inherited external classes will be listed. +# The default value is: NO. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in +# the modules index. If set to NO, only the current project's groups will be +# listed. +# The default value is: YES. EXTERNAL_GROUPS = YES -# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed -# in the related pages index. If set to NO, only the current project's -# pages will be listed. +# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in +# the related pages index. If set to NO, only the current project's pages will +# be listed. +# The default value is: YES. EXTERNAL_PAGES = YES # The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). +# interpreter (i.e. the result of 'which perl'). +# The default file (with absolute path) is: /usr/bin/perl. PERL_PATH = /usr/bin/perl @@ -1670,222 +2019,295 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option also works with HAVE_DOT disabled, but it is recommended to -# install and use dot, since it yields more powerful graphs. +# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram +# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to +# NO turns the diagrams off. Note that this option also works with HAVE_DOT +# disabled, but it is recommended to install and use dot, since it yields more +# powerful graphs. +# The default value is: YES. CLASS_DIAGRAMS = YES # You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# command. Doxygen will then run the mscgen tool (see: +# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the # documentation. The MSCGEN_PATH tag allows you to specify the directory where # the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. + +DIA_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide inheritance +# and usage relations if the target is undocumented or is not a class. +# The default value is: YES. HIDE_UNDOC_RELATIONS = YES # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. The other options in this section have no effect if this option is +# set to NO +# The default value is: YES. HAVE_DOT = @HAVE_DOT@ -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance -# between CPU load and processing speed. +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed +# to run in parallel. When set to 0 doxygen will base this on the number of +# processors available in the system. You can set it explicitly to a value +# larger than 0 to get control over the balance between CPU load and processing +# speed. +# Minimum value: 0, maximum value: 32, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_NUM_THREADS = 0 -# By default doxygen will use the Helvetica font for all dot files that -# doxygen generates. When you want a differently looking font you can specify -# the font name using DOT_FONTNAME. You need to make sure dot is able to find -# the font, which can be done by putting it in a standard location or by setting -# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the -# directory containing the font. +# When you want a differently looking font n the dot files that doxygen +# generates you can specify the font name using DOT_FONTNAME. You need to make +# sure dot is able to find the font, which can be done by putting it in a +# standard location or by setting the DOTFONTPATH environment variable or by +# setting DOT_FONTPATH to the directory containing the font. +# The default value is: Helvetica. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTNAME = -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. +# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of +# dot graphs. +# Minimum value: 4, maximum value: 24, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTSIZE = 10 -# By default doxygen will tell dot to use the Helvetica font. -# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to -# set the path where dot can find it. +# By default doxygen will tell dot to use the default font as specified with +# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set +# the path where dot can find it using this tag. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for +# each documented class showing the direct and indirect inheritance relations. +# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. +# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a +# graph for each documented class showing the direct and indirect implementation +# dependencies (inheritance, containment, and class references variables) of the +# class with other documented classes. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies +# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for +# groups, showing the direct groups dependencies. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. GROUP_GRAPHS = YES # If the UML_LOOK tag is set to YES doxygen will generate inheritance and # collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. UML_LOOK = NO -# If the UML_LOOK tag is enabled, the fields and methods are shown inside -# the class node. If there are many fields or methods and many nodes the -# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS -# threshold limits the number of items for each type to make the size more -# manageable. Set this to 0 for no limit. Note that the threshold may be -# exceeded by 50% before the limit is enforced. +# If the UML_LOOK tag is enabled, the fields and methods are shown inside the +# class node. If there are many fields or methods and many nodes the graph may +# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the +# number of items for each type to make the size more manageable. Set this to 0 +# for no limit. Note that the threshold may be exceeded by 50% before the limit +# is enforced. So when you set the threshold to 10, up to 15 fields may appear, +# but if the number exceeds 15, the total amount of fields shown is limited to +# 10. +# Minimum value: 0, maximum value: 100, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. UML_LIMIT_NUM_FIELDS = 10 -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. +# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and +# collaboration graphs will show the relations between templates and their +# instances. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. TEMPLATE_RELATIONS = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. +# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to +# YES then doxygen will generate a graph for each documented file showing the +# direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. +# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are +# set to YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. +# If the CALL_GRAPH tag is set to YES then doxygen will generate a call +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. CALL_GRAPH = NO -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. +# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will generate a graphical hierarchy of all classes instead of a textual one. +# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical +# hierarchy of all classes instead of a textual one. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. +# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the +# dependencies a directory has on other directories in a graphical way. The +# dependency relations are determined by the #include relations between the +# files in the directories. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are svg, png, jpg, or gif. -# If left blank png will be used. If you choose svg you need to set -# HTML_FILE_EXTENSION to xhtml in order to make the SVG files -# visible in IE 9+ (other browsers do not have this requirement). +# generated by dot. +# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order +# to make the SVG files visible in IE 9+ (other browsers do not have this +# requirement). +# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, +# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, +# gif:cairo:gd, gif:gd, gif:gd:gd and svg. +# The default value is: png. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_IMAGE_FORMAT = svg # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to # enable generation of interactive SVG images that allow zooming and panning. -# Note that this requires a modern browser other than Internet Explorer. -# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you -# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files -# visible. Older versions of IE do not have SVG support. +# +# Note that this requires a modern browser other than Internet Explorer. Tested +# and working are Firefox, Chrome, Safari, and Opera. +# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make +# the SVG files visible. Older versions of IE do not have SVG support. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. INTERACTIVE_SVG = YES -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The DOT_PATH tag can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_PATH = @DOTDIR@ # The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). +# contain dot files that are included in the documentation (see the \dotfile +# command). +# This tag requires that the tag HAVE_DOT is set to YES. DOTFILE_DIRS = # The MSCFILE_DIRS tag can be used to specify one or more directories that -# contain msc files that are included in the documentation (see the -# \mscfile command). +# contain msc files that are included in the documentation (see the \mscfile +# command). MSCFILE_DIRS = -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# The DIAFILE_DIRS tag can be used to specify one or more directories that +# contain dia files that are included in the documentation (see the \diafile +# command). + +DIAFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes +# that will be shown in the graph. If the number of nodes in a graph becomes +# larger than this value, doxygen will truncate the graph, which is visualized +# by representing a node as a red box. Note that doxygen if the number of direct +# children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that +# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# Minimum value: 0, maximum value: 10000, default value: 50. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs +# generated by dot. A depth value of 3 means that only nodes reachable from the +# root by following a path via at most 3 edges will be shown. Nodes that lay +# further from the root node will be omitted. Note that setting this option to 1 +# or 2 may greatly reduce the computation time needed for large code bases. Also +# note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# Minimum value: 0, maximum value: 1000, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. MAX_DOT_GRAPH_DEPTH = 0 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). +# background. This is disabled by default, because dot on Windows does not seem +# to support this out of the box. +# +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_TRANSPARENT = NO # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. +# makes dot run faster, but since only newer versions of dot (>1.8.10) support +# this, this feature is disabled by default. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_MULTI_TARGETS = YES -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. +# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page +# explaining the meaning of the various boxes and arrows in the dot generated +# graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. +# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot +# files that are used to generate the various graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. DOT_CLEANUP = YES diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b25cd7375..51ad08b83 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -225,7 +225,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.0.3"> +<!ENTITY apt-product-version "1.0.4"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fcbf20dac..21878e262 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -390,9 +390,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on high-latency connections. It specifies how many requests are sent in a pipeline. - Previous APT versions had a default of 10 for this setting, but the default value - is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers - and proxies which choose to not conform to the HTTP/1.1 specification.</para> + APT tries to detect and workaround misbehaving webservers and proxies at runtime, but + if you know that yours does not conform to the HTTP/1.1 specification pipelining can + be disabled by setting the value to 0. It is enabled by default with the value 10.</para> <para><literal>Acquire::http::AllowRedirect</literal> controls whether APT will follow redirects, which is enabled by default.</para> diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 7a124d8f9..790f2f1ee 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -1,4 +1,4 @@ -# APT External Dependency Solver Protocol (EDSP) - version 0.4 +# APT External Dependency Solver Protocol (EDSP) - version 0.5 This document describes the communication protocol between APT and external dependency solvers. The protocol is called APT EDSP, for "APT @@ -110,16 +110,24 @@ Within a dependency solving scenario, a request represents the action on installed packages requested by the user. A request is a single Deb 822 stanza opened by a mandatory Request field -and followed by a mixture of action and preference fields. +and followed by a mixture of action, preference, and global +configuration fields. The value of the **Request:** field is a string describing the EDSP protocol which will be used to communicate. At present, the string must -be `EDSP 0.4`. +be `EDSP 0.5`. Request fields are mainly used to identify the beginning +of a request stanza; their actual values are otherwise not used by the +EDSP protocol. -a unique request identifier, such as an -UUID. Request fields are mainly used to identify the beginning of a -request stanza; their actual values are otherwise not used by the EDSP -protocol. +The following **configuration fields** are supported in request stanzas: + +- **Architecture:** (mandatory) The name of the *native* architecture on + the user machine (see also: `dpkg --print-architecture`) + +- **Architectures:** (optional, defaults to the native architecture) A + space separated list of *all* architectures known to APT (this is + roughly equivalent to the union of `dpkg --print-architecture` and + `dpkg --print-foreign-architectures`) The following **action fields** are supported in request stanzas: @@ -201,6 +209,15 @@ field. The following fields are supported in package stanzas: should be removed by the solver only when the Autoremove action is requested (see Request section). +- **APT-Release:** (optional) The releases the package belongs to, according to + APT. The format of this field is multiline with one value per line and the + first line (the one containing the field name) empty. Each subsequent line + corresponds to one of the releases the package belongs to and looks like + this: `o=Debian,a=unstable,n=sid,l=Debian,c=main`. That is, each release line + is a comma-separated list of "key=value" pairs, each of which denotes a + Release file entry (Origin, Label, Codename, etc.) in the format of + APT_PREFERENCES(5). + ### Answer An answer from the external solver to APT is either a *solution* or an diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 9294cca97..a058e6506 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.0.3\n" +"Project-Id-Version: apt-doc 1.0.4~20140610\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/doc/po/de.po b/doc/po/de.po index e5b61da60..b048d9661 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ -# Translation of apt-doc to German +# Translation of apt/doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# This file is distributed under the same license as the apt-doc package. +# This file is distributed under the same license as the apt package. # Chris Leick <c.leick@vollbio.de>, 2009-2014. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.16\n" +"Project-Id-Version: apt-doc 1.0.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-05-05 16:26+0200\n" -"PO-Revision-Date: 2014-04-01 14:00+0200\n" +"PO-Revision-Date: 2014-06-12 20:31+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -633,7 +633,7 @@ msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt.8.xml:32 msgid "command-line interface" -msgstr "" +msgstr "Befehlszeilenschnittstelle" #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 @@ -652,6 +652,11 @@ msgid "" "management of the system. See also &apt-get; and &apt-cache; for more low-" "level command options." msgstr "" +"<command>apt</command> (Advanced Package Tool, auf Deutsch »fortschrittliches " +"Paketwerkzeug«) ist das Befehlszeilenwerkzeug für den Umgang mit Paketen. Es " +"stellt eine Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem " +"System bereit. Weitere untergeordnete Befehlsoptionen finden sie unter " +"&apt-get; und &apt-cache;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:47 @@ -661,6 +666,10 @@ msgid "" "<option>--installed</option>, <option>--upgradable</option>, <option>--all-" "versions</option> are supported." msgstr "" +"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es " +"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die " +"folgenden Optionen werden unterstützt: <option>--installed</option>, " +"<option>--upgradable</option>, <option>--all-versions</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:58 @@ -668,19 +677,17 @@ msgid "" "<literal>search</literal> searches for the given term(s) and display " "matching packages." msgstr "" +"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt passende " +"Pakete an." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:64 -#, fuzzy -#| msgid "" -#| "<literal>rdepends</literal> shows a listing of each reverse dependency a " -#| "package has." msgid "" "<literal>show</literal> shows the package information for the given " "package(s)." msgstr "" -"<literal>rdepends</literal> zeigt eine Liste von jeder " -"Rückwärtsabhängigkeit, die ein Paket hat." +"<literal>show</literal> zeigt die Paketinformationen für die angegebenen " +"Pakete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:71 @@ -688,6 +695,8 @@ msgid "" "<literal>install</literal> is followed by one or more package names desired " "for installation or upgrading." msgstr "" +"<literal>install</literal> ist gefolgt von einem oder mehreren Paketnamen, " +"von denen eine Installation oder ein Upgrade gewünscht wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:75 apt-get.8.xml:118 @@ -728,19 +737,17 @@ msgid "" "<literal>edit-sources</literal> lets you edit your sources.list file and " "provides basic sanity checks." msgstr "" +"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer " +"»sources.list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:99 -#, fuzzy -#| msgid "" -#| "<literal>showhold</literal> is used to print a list of packages on hold " -#| "in the same way as for the other show commands." msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources." msgstr "" -"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter " -"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben." +"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit " +"ihren Quellen in Einklang zu bringen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:105 @@ -750,6 +757,11 @@ msgid "" "<filename>/etc/apt/sources.list</filename>. New package will be installed, " "but existing package will never removed." msgstr "" +"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller " +"derzeit auf Ihrem System installierten Pakete von den in " +"<filename>/etc/apt/sources.list</filename> aufgezählten Quellen zu " +"installieren. Dabei werden neue Pakete installiert, existierende jedoch nicht " +"entfernt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:114 @@ -758,6 +770,9 @@ msgid "" "also remove installed packages if that is required in order to resolve a " "package conflict." msgstr "" +"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann " +"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines " +"Paketkonflikts nötig ist." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 @@ -769,7 +784,7 @@ msgstr "Optionen" #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:134 msgid "Script usage" -msgstr "" +msgstr "Skriptaufruf" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:136 @@ -780,11 +795,17 @@ msgid "" "&apt-cache; and &apt-get; via APT options. Please prefer using these " "commands in your scripts." msgstr "" +"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann die " +"Ausgabe zwischen Versionen ändern. Obwohl es versucht, nicht die " +"Abwärtskompatibilität zu unterbrechen, gibt es dafür keine Garantie. Alle " +"Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über " +"APT-Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in " +"Ihren Skripten." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:144 msgid "Differences to &apt-get;" -msgstr "" +msgstr "Unterschiede zu &apt-get;" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:145 @@ -793,20 +814,19 @@ msgid "" "does not need to be backward compatible like &apt-get;. Therefore some " "options are different:" msgstr "" +"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die " +"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-get;. " +"Daher unterscheiden sich einige Optionen:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:151 -#, fuzzy -#| msgid "the <literal>Package:</literal> line" msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled." -msgstr "die <literal>Package:</literal>-Zeile" +msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:155 -#, fuzzy -#| msgid "the <literal>Component:</literal> line" msgid "The option <literal>APT::Color</literal> is enabled." -msgstr "die <literal>Component:</literal>-Zeile" +msgstr "Die Option <literal>APT::Color</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:159 @@ -814,15 +834,17 @@ msgid "" "A new <literal>list</literal> command is available similar to <literal>dpkg " "--list</literal>." msgstr "" +"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg " +"--list</literal> ähnlich." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:164 -#, fuzzy -#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgid "" "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> " "enabled by default." -msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" +msgstr "" +"Bei der Option <literal>upgrade</literal> ist standardmäßig " +"<literal>--with-new-pkgs</literal> aktiviert." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 @@ -835,18 +857,12 @@ msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:175 -#, fuzzy -#| msgid "" -#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-" -#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -#| "preferences;, the APT Howto." msgid "" "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT " "User's guide in &guidesdir;, &apt-preferences;, the APT Howto." msgstr "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " -"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, " -"das APT-Howto." +"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die " +"APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137 @@ -857,15 +873,11 @@ msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:181 -#, fuzzy -#| msgid "" -#| "<command>apt-get</command> returns zero on normal operation, decimal 100 " -#| "on error." msgid "" "<command>apt</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" -"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal " +"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal " "100 bei Fehlern." #. type: Content of: <refentry><refnamediv><refpurpose> @@ -1766,13 +1778,6 @@ msgstr "" # FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:535 -#, fuzzy -#| msgid "" -#| "Show user friendly progress information in the terminal window when " -#| "packages are installed, upgraded or removed. For a machine parsable " -#| "version of this data see README.progress-reporting in the apt doc " -#| "directory. Configuration Item: <literal>DpkgPM::Progress</literal> and " -#| "<literal>Dpkg::Progress-Fancy</literal>." msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1783,8 +1788,8 @@ msgstr "" "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn " "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade " "durchgeführt wird. Informationen über eine maschinell auswertbare Version " -"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. " -"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und " +"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. " +"Konfigurationselemente: <literal>Dpkg::Progress</literal> und " "<literal>Dpkg::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> @@ -5434,6 +5439,10 @@ msgid "" "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or " "<literal>APT::Update::{Pre,Post}-Invoke</literal>." msgstr "" +"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies " +"schließt z.B. die Konfigurationsoptionen " +"<literal>DPkg::{Pre,Post}-Invoke</literal> oder " +"<literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 @@ -8834,20 +8843,12 @@ msgstr "" "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine " "Entscheidungen können manchmal ziemlich überraschend sein." +# s/package/packages/ #. type: <p></p> #: guide.sgml:163 -#, fuzzy -#| msgid "" -#| "<prgn>apt-get</prgn> has several command line options that are detailed " -#| "in its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " -#| "option is <tt>-d</tt> which does not install the fetched files. If the " -#| "system has to download a large number of package it would be undesired to " -#| "start installing them in case something goes wrong. When <tt>-d</tt> is " -#| "used the downloaded archives can be installed by simply running the " -#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 12eac20d8..7770a3244 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -21,11 +21,13 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/debfile.h> #include <apt-pkg/gpgv.h> +#include <apt-pkg/hashes.h> #include <netinet/in.h> // htonl, etc #include <ctype.h> #include <stddef.h> #include <sys/stat.h> +#include <strings.h> #include "cachedb.h" @@ -99,7 +101,7 @@ bool CacheDB::ReadyDB(std::string const &DB) return _error->Error(_("Unable to open DB file %s: %s"),DB.c_str(), db_strerror(err)); } } - + DBFile = DB; DBLoaded = true; return true; @@ -188,6 +190,45 @@ bool CacheDB::GetFileStat(bool const &doStat) return true; } /*}}}*/ +// CacheDB::GetCurStatCompatOldFormat /*{{{*/ +// --------------------------------------------------------------------- +/* Read the old (32bit FileSize) StateStore format from disk */ +bool CacheDB::GetCurStatCompatOldFormat() +{ + InitQueryStats(); + Data.data = &CurStatOldFormat; + Data.flags = DB_DBT_USERMEM; + Data.ulen = sizeof(CurStatOldFormat); + if (Get() == false) + { + CurStat.Flags = 0; + } else { + CurStat.Flags = CurStatOldFormat.Flags; + CurStat.mtime = CurStatOldFormat.mtime; + CurStat.FileSize = CurStatOldFormat.FileSize; + memcpy(CurStat.MD5, CurStatOldFormat.MD5, sizeof(CurStat.MD5)); + memcpy(CurStat.SHA1, CurStatOldFormat.SHA1, sizeof(CurStat.SHA1)); + memcpy(CurStat.SHA256, CurStatOldFormat.SHA256, sizeof(CurStat.SHA256)); + } + return true; +} + /*}}}*/ +// CacheDB::GetCurStatCompatOldFormat /*{{{*/ +// --------------------------------------------------------------------- +/* Read the new (64bit FileSize) StateStore format from disk */ +bool CacheDB::GetCurStatCompatNewFormat() +{ + InitQueryStats(); + Data.data = &CurStat; + Data.flags = DB_DBT_USERMEM; + Data.ulen = sizeof(CurStat); + if (Get() == false) + { + CurStat.Flags = 0; + } + return true; +} + /*}}}*/ // CacheDB::GetCurStat - Set the CurStat variable. /*{{{*/ // --------------------------------------------------------------------- /* Sets the CurStat variable. Either to 0 if no database is used @@ -198,19 +239,29 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if there is anything about it - in the database */ - - /* Get the flags (and mtime) */ + // do a first query to just get the size of the data on disk InitQueryStats(); - // Ensure alignment of the returned structure Data.data = &CurStat; - Data.ulen = sizeof(CurStat); Data.flags = DB_DBT_USERMEM; - if (Get() == false) + Data.ulen = 0; + Get(); + + if (Data.size == 0) + { + // nothing needs to be done, we just have not data for this deb + } + // check if the record is written in the old format (32bit filesize) + else if(Data.size == sizeof(CurStatOldFormat)) + { + GetCurStatCompatOldFormat(); + } + else if(Data.size == sizeof(CurStat)) { - CurStat.Flags = 0; - } + GetCurStatCompatNewFormat(); + } else { + return _error->Error("Cache record size mismatch (%ul)", Data.size); + } + CurStat.Flags = ntohl(CurStat.Flags); CurStat.FileSize = ntohl(CurStat.FileSize); } @@ -219,15 +270,10 @@ bool CacheDB::GetCurStat() /*}}}*/ // CacheDB::GetFileInfo - Get all the info about the file /*{{{*/ // --------------------------------------------------------------------- -bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, - bool const &DoContents, - bool const &GenContentsOnly, - bool const &DoSource, - bool const &DoMD5, bool const &DoSHA1, - bool const &DoSHA256, bool const &DoSHA512, +bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, + bool const &GenContentsOnly, bool const DoSource, unsigned int const DoHashes, bool const &checkMtime) { - bool result = true; this->FileName = FileName; if (GetCurStat() == false) @@ -235,31 +281,28 @@ bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, OldStat = CurStat; if (GetFileStat(checkMtime) == false) - return false; + return false; /* if mtime changed, update CurStat from disk */ if (checkMtime == true && OldStat.mtime != CurStat.mtime) CurStat.Flags = FlSize; Stats.Bytes += CurStat.FileSize; - Stats.Packages++; + ++Stats.Packages; if ((DoControl && LoadControl() == false) - || (DoContents && LoadContents(GenContentsOnly) == false) - || (DoSource && LoadSource() == false) - || (DoMD5 && GetMD5(false) == false) - || (DoSHA1 && GetSHA1(false) == false) - || (DoSHA256 && GetSHA256(false) == false) - || (DoSHA512 && GetSHA512(false) == false) ) + || (DoContents && LoadContents(GenContentsOnly) == false) + || (DoSource && LoadSource() == false) + || (DoHashes != 0 && GetHashes(false, DoHashes) == false) + ) { - result = false; + return false; } - - return result; + + return true; } /*}}}*/ - -bool CacheDB::LoadSource() +bool CacheDB::LoadSource() /*{{{*/ { // Try to read the control information out of the DB. if ((CurStat.Flags & FlSource) == FlSource) @@ -289,7 +332,7 @@ bool CacheDB::LoadSource() return true; } - + /*}}}*/ // CacheDB::LoadControl - Load Control information /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -358,7 +401,7 @@ bool CacheDB::LoadContents(bool const &GenOnly) return true; } /*}}}*/ - +// CacheDB::GetHashes - Get the hashs /*{{{*/ static std::string bytes2hex(uint8_t *bytes, size_t length) { char buf[3]; std::string space; @@ -388,125 +431,59 @@ static void hex2bytes(uint8_t *bytes, const char *hex, int length) { bytes++; } } - -// CacheDB::GetMD5 - Get the MD5 hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CacheDB::GetMD5(bool const &GenOnly) +bool CacheDB::GetHashes(bool const GenOnly, unsigned int const DoHashes) { - // Try to read the control information out of the DB. - if ((CurStat.Flags & FlMD5) == FlMD5) - { - if (GenOnly == true) - return true; - - MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5)); - return true; - } - - Stats.MD5Bytes += CurStat.FileSize; - - if (OpenFile() == false) - return false; + unsigned int FlHashes = DoHashes & (Hashes::MD5SUM | Hashes::SHA1SUM | Hashes::SHA256SUM | Hashes::SHA512SUM); + HashesList.clear(); - MD5Summation MD5; - if (Fd->Seek(0) == false || MD5.AddFD(*Fd, CurStat.FileSize) == false) - return false; - - MD5Res = MD5.Result(); - hex2bytes(CurStat.MD5, MD5Res.data(), sizeof(CurStat.MD5)); - CurStat.Flags |= FlMD5; - return true; -} - /*}}}*/ -// CacheDB::GetSHA1 - Get the SHA1 hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CacheDB::GetSHA1(bool const &GenOnly) -{ - // Try to read the control information out of the DB. - if ((CurStat.Flags & FlSHA1) == FlSHA1) + if (FlHashes != 0) { - if (GenOnly == true) - return true; - - SHA1Res = bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1)); - return true; - } - - Stats.SHA1Bytes += CurStat.FileSize; - - if (OpenFile() == false) - return false; + if (OpenFile() == false) + return false; - SHA1Summation SHA1; - if (Fd->Seek(0) == false || SHA1.AddFD(*Fd, CurStat.FileSize) == false) - return false; - - SHA1Res = SHA1.Result(); - hex2bytes(CurStat.SHA1, SHA1Res.data(), sizeof(CurStat.SHA1)); - CurStat.Flags |= FlSHA1; - return true; -} - /*}}}*/ -// CacheDB::GetSHA256 - Get the SHA256 hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CacheDB::GetSHA256(bool const &GenOnly) -{ - // Try to read the control information out of the DB. - if ((CurStat.Flags & FlSHA256) == FlSHA256) - { - if (GenOnly == true) - return true; + Hashes hashes; + if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize, FlHashes) == false) + return false; - SHA256Res = bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256)); - return true; + HashStringList hl = hashes.GetHashStringList(); + for (HashStringList::const_iterator hs = hl.begin(); hs != hl.end(); ++hs) + { + HashesList.push_back(*hs); + if (strcasecmp(hs->HashType().c_str(), "SHA512") == 0) + { + Stats.SHA512Bytes += CurStat.FileSize; + hex2bytes(CurStat.SHA512, hs->HashValue().data(), sizeof(CurStat.SHA512)); + CurStat.Flags |= FlSHA512; + } + else if (strcasecmp(hs->HashType().c_str(), "SHA256") == 0) + { + Stats.SHA256Bytes += CurStat.FileSize; + hex2bytes(CurStat.SHA256, hs->HashValue().data(), sizeof(CurStat.SHA256)); + CurStat.Flags |= FlSHA256; + } + else if (strcasecmp(hs->HashType().c_str(), "SHA1") == 0) + { + Stats.SHA1Bytes += CurStat.FileSize; + hex2bytes(CurStat.SHA1, hs->HashValue().data(), sizeof(CurStat.SHA1)); + CurStat.Flags |= FlSHA1; + } + else if (strcasecmp(hs->HashType().c_str(), "MD5Sum") == 0) + { + Stats.MD5Bytes += CurStat.FileSize; + hex2bytes(CurStat.MD5, hs->HashValue().data(), sizeof(CurStat.MD5)); + CurStat.Flags |= FlMD5; + } + else + return _error->Error("Got unknown unrequested hashtype %s", hs->HashType().c_str()); + } } - - Stats.SHA256Bytes += CurStat.FileSize; - - if (OpenFile() == false) - return false; - - SHA256Summation SHA256; - if (Fd->Seek(0) == false || SHA256.AddFD(*Fd, CurStat.FileSize) == false) - return false; - - SHA256Res = SHA256.Result(); - hex2bytes(CurStat.SHA256, SHA256Res.data(), sizeof(CurStat.SHA256)); - CurStat.Flags |= FlSHA256; - return true; -} - /*}}}*/ -// CacheDB::GetSHA256 - Get the SHA256 hash /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CacheDB::GetSHA512(bool const &GenOnly) -{ - // Try to read the control information out of the DB. - if ((CurStat.Flags & FlSHA512) == FlSHA512) - { - if (GenOnly == true) - return true; - - SHA512Res = bytes2hex(CurStat.SHA512, sizeof(CurStat.SHA512)); + if (GenOnly == true) return true; - } - - Stats.SHA512Bytes += CurStat.FileSize; - - if (OpenFile() == false) - return false; - SHA512Summation SHA512; - if (Fd->Seek(0) == false || SHA512.AddFD(*Fd, CurStat.FileSize) == false) - return false; - - SHA512Res = SHA512.Result(); - hex2bytes(CurStat.SHA512, SHA512Res.data(), sizeof(CurStat.SHA512)); - CurStat.Flags |= FlSHA512; - return true; + return HashesList.push_back(HashString("MD5Sum", bytes2hex(CurStat.MD5, sizeof(CurStat.MD5)))) && + HashesList.push_back(HashString("SHA1", bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1)))) && + HashesList.push_back(HashString("SHA256", bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256)))) && + HashesList.push_back(HashString("SHA512", bytes2hex(CurStat.SHA512, sizeof(CurStat.SHA512)))); } /*}}}*/ // CacheDB::Finish - Write back the cache structure /*{{{*/ diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index edb8594bf..b40fd7df7 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,6 +12,7 @@ #ifndef CACHEDB_H #define CACHEDB_H +#include <apt-pkg/hashes.h> #include <apt-pkg/debfile.h> #include <db.h> @@ -85,22 +86,37 @@ class CacheDB bool OpenDebFile(); void CloseDebFile(); - bool GetFileStat(bool const &doStat = false); + // GetCurStat needs some compat code, see lp #1274466) + bool GetCurStatCompatOldFormat(); + bool GetCurStatCompatNewFormat(); bool GetCurStat(); + + bool GetFileStat(bool const &doStat = false); bool LoadControl(); bool LoadContents(bool const &GenOnly); bool LoadSource(); - bool GetMD5(bool const &GenOnly); - bool GetSHA1(bool const &GenOnly); - bool GetSHA256(bool const &GenOnly); - bool GetSHA512(bool const &GenOnly); - + bool GetHashes(bool const GenOnly, unsigned int const DoHashes); + // Stat info stored in the DB, Fixed types since it is written to disk. enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2), FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5), FlSHA512=(1<<6), FlSource=(1<<7), }; + // the on-disk format changed (FileSize increased to 64bit) in + // commit 650faab0 which will lead to corruption with old caches + struct StatStoreOldFormat + { + uint32_t Flags; + uint32_t mtime; + uint32_t FileSize; + uint8_t MD5[16]; + uint8_t SHA1[20]; + uint8_t SHA256[32]; + } CurStatOldFormat; + + // WARNING: this struct is read/written to the DB so do not change the + // layout of the fields (see lp #1274466), only append to it struct StatStore { uint32_t Flags; @@ -124,12 +140,8 @@ class CacheDB debDebFile::MemControlExtract Control; ContentsExtract Contents; DscExtract Dsc; + HashStringList HashesList; - std::string MD5Res; - std::string SHA1Res; - std::string SHA256Res; - std::string SHA512Res; - // Runtime statistics struct Stats { @@ -165,16 +177,13 @@ class CacheDB bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd); // terrible old overloaded interface - bool GetFileInfo(std::string const &FileName, - bool const &DoControl, - bool const &DoContents, - bool const &GenContentsOnly, - bool const &DoSource, - bool const &DoMD5, - bool const &DoSHA1, - bool const &DoSHA256, - bool const &DoSHA512, - bool const &checkMtime = false); + bool GetFileInfo(std::string const &FileName, + bool const &DoControl, + bool const &DoContents, + bool const &GenContentsOnly, + bool const DoSource, + unsigned int const DoHashes, + bool const &checkMtime = false); bool Finish(); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 7c1c9cc03..db617e92a 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -54,29 +54,42 @@ FTWScanner *FTWScanner::Owner; // SetTFRewriteData - Helper for setting rewrite lists /*{{{*/ // --------------------------------------------------------------------- /* */ -inline void SetTFRewriteData(struct TFRewriteData &tfrd, - const char *tag, +static inline TFRewriteData SetTFRewriteData(const char *tag, const char *rewrite, const char *newtag = 0) { - tfrd.Tag = tag; - tfrd.Rewrite = rewrite; - tfrd.NewTag = newtag; + TFRewriteData tfrd; + tfrd.Tag = tag; + tfrd.Rewrite = rewrite; + tfrd.NewTag = newtag; + return tfrd; +} + /*}}}*/ +// ConfigToDoHashes - which hashes to generate /*{{{*/ +static void SingleConfigToDoHashes(unsigned int &DoHashes, std::string const &Conf, unsigned int const Flag) +{ + if (_config->FindB(Conf, true) == true) + DoHashes |= Flag; + else + DoHashes &= ~Flag; +} +static void ConfigToDoHashes(unsigned int &DoHashes, std::string const &Conf) +{ + SingleConfigToDoHashes(DoHashes, Conf + "::MD5", Hashes::MD5SUM); + SingleConfigToDoHashes(DoHashes, Conf + "::SHA1", Hashes::SHA1SUM); + SingleConfigToDoHashes(DoHashes, Conf + "::SHA256", Hashes::SHA256SUM); + SingleConfigToDoHashes(DoHashes, Conf + "::SHA512", Hashes::SHA512SUM); } /*}}}*/ // FTWScanner::FTWScanner - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -FTWScanner::FTWScanner(string const &Arch): Arch(Arch) +FTWScanner::FTWScanner(string const &Arch): Arch(Arch), DoHashes(~0) { ErrorPrinted = false; NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true); - - DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); - DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); - DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); - DoSHA512 = _config->FindB("APT::FTPArchive::SHA512",true); + ConfigToDoHashes(DoHashes, "APT::FTPArchive"); } /*}}}*/ // FTWScanner::Scanner - FTW Scanner /*{{{*/ @@ -327,10 +340,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c DeLinkLimit = 0; // Process the command line options - DoMD5 = _config->FindB("APT::FTPArchive::Packages::MD5",DoMD5); - DoSHA1 = _config->FindB("APT::FTPArchive::Packages::SHA1",DoSHA1); - DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA256",DoSHA256); - DoSHA512 = _config->FindB("APT::FTPArchive::Packages::SHA512",DoSHA512); + ConfigToDoHashes(DoHashes, "APT::FTPArchive::Packages"); DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); @@ -385,12 +395,12 @@ bool FTWScanner::SetExts(string const &Vals) bool PackagesWriter::DoPackage(string FileName) { // Pull all the data we need form the DB - if (Db.GetFileInfo(FileName, - true, /* DoControl */ - DoContents, - true, /* GenContentsOnly */ - false, /* DoSource */ - DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat) == false) + if (Db.GetFileInfo(FileName, + true, /* DoControl */ + DoContents, + true, /* GenContentsOnly */ + false, /* DoSource */ + DoHashes, DoAlwaysStat) == false) { return false; } @@ -454,30 +464,27 @@ bool PackagesWriter::DoPackage(string FileName) } // This lists all the changes to the fields we are going to make. - // (7 hardcoded + maintainer + suggests + end marker) - TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1+1]; - - unsigned int End = 0; - SetTFRewriteData(Changes[End++], "Size", Size); - if (DoMD5 == true) - SetTFRewriteData(Changes[End++], "MD5sum", Db.MD5Res.c_str()); - if (DoSHA1 == true) - SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str()); - if (DoSHA256 == true) - SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str()); - if (DoSHA512 == true) - SetTFRewriteData(Changes[End++], "SHA512", Db.SHA512Res.c_str()); - SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str()); - SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str()); - SetTFRewriteData(Changes[End++], "Status", 0); - SetTFRewriteData(Changes[End++], "Optional", 0); + std::vector<TFRewriteData> Changes; + + Changes.push_back(SetTFRewriteData("Size", Size)); + for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs) + { + if (hs->HashType() == "MD5Sum") + Changes.push_back(SetTFRewriteData("MD5sum", hs->HashValue().c_str())); + else + Changes.push_back(SetTFRewriteData(hs->HashType().c_str(), hs->HashValue().c_str())); + } + Changes.push_back(SetTFRewriteData("Filename", NewFileName.c_str())); + Changes.push_back(SetTFRewriteData("Priority", OverItem->Priority.c_str())); + Changes.push_back(SetTFRewriteData("Status", 0)); + Changes.push_back(SetTFRewriteData("Optional", 0)); string DescriptionMd5; if (LongDescription == false) { MD5Summation descmd5; descmd5.Add(desc.c_str()); DescriptionMd5 = descmd5.Result().Value(); - SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + Changes.push_back(SetTFRewriteData("Description-md5", DescriptionMd5.c_str())); if (TransWriter != NULL) TransWriter->DoPackage(Package, desc, DescriptionMd5); } @@ -492,12 +499,12 @@ bool PackagesWriter::DoPackage(string FileName) NewLine(1); ioprintf(c1out, _(" %s maintainer is %s not %s\n"), Package.c_str(), Tags.FindS("Maintainer").c_str(), OverItem->OldMaint.c_str()); - } + } } - + if (NewMaint.empty() == false) - SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); - + Changes.push_back(SetTFRewriteData("Maintainer", NewMaint.c_str())); + /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the @@ -508,17 +515,17 @@ bool PackagesWriter::DoPackage(string FileName) { if (Tags.FindS("Suggests").empty() == false) OptionalStr = Tags.FindS("Suggests") + ", " + OptionalStr; - SetTFRewriteData(Changes[End++], "Suggests", OptionalStr.c_str()); + Changes.push_back(SetTFRewriteData("Suggests", OptionalStr.c_str())); } - for (map<string,string>::const_iterator I = OverItem->FieldOverride.begin(); + for (map<string,string>::const_iterator I = OverItem->FieldOverride.begin(); I != OverItem->FieldOverride.end(); ++I) - SetTFRewriteData(Changes[End++],I->first.c_str(),I->second.c_str()); + Changes.push_back(SetTFRewriteData(I->first.c_str(),I->second.c_str())); - SetTFRewriteData(Changes[End++], 0, 0); + Changes.push_back(SetTFRewriteData( 0, 0)); // Rewrite and store the fields. - if (TFRewrite(Output,Tags,TFRewritePackageOrder,Changes) == false) + if (TFRewrite(Output,Tags,TFRewritePackageOrder,Changes.data()) == false) return false; fprintf(Output,"\n"); @@ -589,10 +596,7 @@ SourcesWriter::SourcesWriter(string const &DB, string const &BOverrides,string c BufSize = 0; // Process the command line options - DoMD5 = _config->FindB("APT::FTPArchive::Sources::MD5",DoMD5); - DoSHA1 = _config->FindB("APT::FTPArchive::Sources::SHA1",DoSHA1); - DoSHA256 = _config->FindB("APT::FTPArchive::Sources::SHA256",DoSHA256); - DoSHA512 = _config->FindB("APT::FTPArchive::Sources::SHA512",DoSHA512); + ConfigToDoHashes(DoHashes, "APT::FTPArchive::Sources"); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false); @@ -614,17 +618,25 @@ SourcesWriter::SourcesWriter(string const &DB, string const &BOverrides,string c } /*}}}*/ // SourcesWriter::DoPackage - Process a single package /*{{{*/ -// --------------------------------------------------------------------- -/* */ +static std::ostream& addDscHash(std::ostream &out, unsigned int const DoHashes, + Hashes::SupportedHashes const DoIt, pkgTagSection &Tags, char const * const FieldName, + HashString const * const Hash, unsigned long long Size, std::string FileName) +{ + if ((DoHashes & DoIt) != DoIt || Tags.Exists(FieldName) == false || Hash == NULL) + return out; + out << "\n " << Hash->HashValue() << " " << Size << " " << FileName + << "\n " << Tags.FindS(FieldName); + return out; +} bool SourcesWriter::DoPackage(string FileName) { // Pull all the data we need form the DB if (Db.GetFileInfo(FileName, - false, /* DoControl */ - false, /* DoContents */ - false, /* GenContentsOnly */ - true, /* DoSource */ - DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat) == false) + false, /* DoControl */ + false, /* DoContents */ + false, /* GenContentsOnly */ + true, /* DoSource */ + DoHashes, DoAlwaysStat) == false) { return false; } @@ -712,29 +724,19 @@ bool SourcesWriter::DoPackage(string FileName) *SOverItem = *OverItem; } } - + // Add the dsc to the files hash list string const strippedName = flNotDir(FileName); std::ostringstream ostreamFiles; - if (DoMD5 == true && Tags.Exists("Files")) - ostreamFiles << "\n " << Db.MD5Res.c_str() << " " << St.st_size << " " - << strippedName << "\n " << Tags.FindS("Files"); + addDscHash(ostreamFiles, DoHashes, Hashes::MD5SUM, Tags, "Files", Db.HashesList.find("MD5Sum"), St.st_size, strippedName); string const Files = ostreamFiles.str(); std::ostringstream ostreamSha1; - if (DoSHA1 == true && Tags.Exists("Checksums-Sha1")) - ostreamSha1 << "\n " << string(Db.SHA1Res.c_str()) << " " << St.st_size << " " - << strippedName << "\n " << Tags.FindS("Checksums-Sha1"); - + addDscHash(ostreamSha1, DoHashes, Hashes::SHA1SUM, Tags, "Checksums-Sha1", Db.HashesList.find("SHA1"), St.st_size, strippedName); std::ostringstream ostreamSha256; - if (DoSHA256 == true && Tags.Exists("Checksums-Sha256")) - ostreamSha256 << "\n " << string(Db.SHA256Res.c_str()) << " " << St.st_size << " " - << strippedName << "\n " << Tags.FindS("Checksums-Sha256"); - + addDscHash(ostreamSha256, DoHashes, Hashes::SHA256SUM, Tags, "Checksums-Sha256", Db.HashesList.find("SHA256"), St.st_size, strippedName); std::ostringstream ostreamSha512; - if (DoSHA512 == true && Tags.Exists("Checksums-Sha512")) - ostreamSha512 << "\n " << string(Db.SHA512Res.c_str()) << " " << St.st_size << " " - << strippedName << "\n " << Tags.FindS("Checksums-Sha512"); + addDscHash(ostreamSha512, DoHashes, Hashes::SHA512SUM, Tags, "Checksums-Sha512", Db.HashesList.find("SHA512"), St.st_size, strippedName); // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; @@ -766,35 +768,54 @@ bool SourcesWriter::DoPackage(string FileName) string OriginalPath = Directory + ParseJnk; // Add missing hashes to source files - if ((DoSHA1 == true && !Tags.Exists("Checksums-Sha1")) || - (DoSHA256 == true && !Tags.Exists("Checksums-Sha256")) || - (DoSHA512 == true && !Tags.Exists("Checksums-Sha512"))) + if (((DoHashes & Hashes::SHA1SUM) == Hashes::SHA1SUM && !Tags.Exists("Checksums-Sha1")) || + ((DoHashes & Hashes::SHA256SUM) == Hashes::SHA256SUM && !Tags.Exists("Checksums-Sha256")) || + ((DoHashes & Hashes::SHA512SUM) == Hashes::SHA512SUM && !Tags.Exists("Checksums-Sha512"))) { - if (Db.GetFileInfo(OriginalPath, + if (Db.GetFileInfo(OriginalPath, false, /* DoControl */ false, /* DoContents */ false, /* GenContentsOnly */ false, /* DoSource */ - DoMD5, DoSHA1, DoSHA256, DoSHA512, + DoHashes, DoAlwaysStat) == false) { return _error->Error("Error getting file info"); } - if (DoSHA1 == true && !Tags.Exists("Checksums-Sha1")) - ostreamSha1 << "\n " << string(Db.SHA1Res) << " " - << Db.GetFileSize() << " " << ParseJnk; - - if (DoSHA256 == true && !Tags.Exists("Checksums-Sha256")) - ostreamSha256 << "\n " << string(Db.SHA256Res) << " " - << Db.GetFileSize() << " " << ParseJnk; - - if (DoSHA512 == true && !Tags.Exists("Checksums-Sha512")) - ostreamSha512 << "\n " << string(Db.SHA512Res) << " " - << Db.GetFileSize() << " " << ParseJnk; + for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs) + { + if (hs->HashType() == "MD5Sum") + continue; + char const * fieldname; + std::ostream * out; + if (hs->HashType() == "SHA1") + { + fieldname = "Checksums-Sha1"; + out = &ostreamSha1; + } + else if (hs->HashType() == "SHA256") + { + fieldname = "Checksums-Sha256"; + out = &ostreamSha256; + } + else if (hs->HashType() == "SHA512") + { + fieldname = "Checksums-Sha512"; + out = &ostreamSha512; + } + else + { + _error->Warning("Ignoring unknown Checksumtype %s in SourcesWriter::DoPackages", hs->HashType().c_str()); + continue; + } + if (Tags.Exists(fieldname) == true) + continue; + (*out) << "\n " << hs->HashValue() << " " << Db.GetFileSize() << " " << ParseJnk; + } - // write back the GetFileInfo() stats data - Db.Finish(); + // write back the GetFileInfo() stats data + Db.Finish(); } // Perform the delinking operation @@ -820,22 +841,21 @@ bool SourcesWriter::DoPackage(string FileName) // This lists all the changes to the fields we are going to make. // (5 hardcoded + checksums + maintainer + end marker) - TFRewriteData Changes[5+2+1+SOverItem->FieldOverride.size()+1]; + std::vector<TFRewriteData> Changes; - unsigned int End = 0; - SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package"); + Changes.push_back(SetTFRewriteData("Source",Package.c_str(),"Package")); if (Files.empty() == false) - SetTFRewriteData(Changes[End++],"Files",Files.c_str()); + Changes.push_back(SetTFRewriteData("Files",Files.c_str())); if (ChecksumsSha1.empty() == false) - SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1.c_str()); + Changes.push_back(SetTFRewriteData("Checksums-Sha1",ChecksumsSha1.c_str())); if (ChecksumsSha256.empty() == false) - SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256.c_str()); + Changes.push_back(SetTFRewriteData("Checksums-Sha256",ChecksumsSha256.c_str())); if (ChecksumsSha512.empty() == false) - SetTFRewriteData(Changes[End++],"Checksums-Sha512",ChecksumsSha512.c_str()); + Changes.push_back(SetTFRewriteData("Checksums-Sha512",ChecksumsSha512.c_str())); if (Directory != "./") - SetTFRewriteData(Changes[End++],"Directory",Directory.c_str()); - SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str()); - SetTFRewriteData(Changes[End++],"Status",0); + Changes.push_back(SetTFRewriteData("Directory",Directory.c_str())); + Changes.push_back(SetTFRewriteData("Priority",BestPrio.c_str())); + Changes.push_back(SetTFRewriteData("Status",0)); // Rewrite the maintainer field if necessary bool MaintFailed; @@ -850,16 +870,16 @@ bool SourcesWriter::DoPackage(string FileName) } } if (NewMaint.empty() == false) - SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); + Changes.push_back(SetTFRewriteData("Maintainer", NewMaint.c_str())); for (map<string,string>::const_iterator I = SOverItem->FieldOverride.begin(); I != SOverItem->FieldOverride.end(); ++I) - SetTFRewriteData(Changes[End++],I->first.c_str(),I->second.c_str()); + Changes.push_back(SetTFRewriteData(I->first.c_str(),I->second.c_str())); - SetTFRewriteData(Changes[End++], 0, 0); + Changes.push_back(SetTFRewriteData(0, 0)); // Rewrite and store the fields. - if (TFRewrite(Output,Tags,TFRewriteSourceOrder,Changes) == false) + if (TFRewrite(Output,Tags,TFRewriteSourceOrder,Changes.data()) == false) return false; fprintf(Output,"\n"); @@ -886,15 +906,13 @@ ContentsWriter::ContentsWriter(string const &DB, string const &Arch) : determine what the package name is. */ bool ContentsWriter::DoPackage(string FileName, string Package) { - if (!Db.GetFileInfo(FileName, - Package.empty(), /* DoControl */ - true, /* DoContents */ - false, /* GenContentsOnly */ - false, /* DoSource */ - false, /* DoMD5 */ - false, /* DoSHA1 */ - false, /* DoSHA256 */ - false)) /* DoSHA512 */ + if (!Db.GetFileInfo(FileName, + Package.empty(), /* DoControl */ + true, /* DoContents */ + false, /* GenContentsOnly */ + false, /* DoSource */ + 0, /* DoHashes */ + false /* checkMtime */)) { return false; } @@ -1030,9 +1048,7 @@ ReleaseWriter::ReleaseWriter(string const &/*DB*/) fprintf(Output, "%s: %s\n", (*I).first.c_str(), Value.c_str()); } - DoMD5 = _config->FindB("APT::FTPArchive::Release::MD5",DoMD5); - DoSHA1 = _config->FindB("APT::FTPArchive::Release::SHA1",DoSHA1); - DoSHA256 = _config->FindB("APT::FTPArchive::Release::SHA256",DoSHA256); + ConfigToDoHashes(DoHashes, "APT::FTPArchive::Release"); } /*}}}*/ // ReleaseWriter::DoPackage - Process a single package /*{{{*/ @@ -1066,15 +1082,8 @@ bool ReleaseWriter::DoPackage(string FileName) CheckSums[NewFileName].size = fd.Size(); Hashes hs; - hs.AddFD(fd, 0, DoMD5, DoSHA1, DoSHA256, DoSHA512); - if (DoMD5 == true) - CheckSums[NewFileName].MD5 = hs.MD5.Result(); - if (DoSHA1 == true) - CheckSums[NewFileName].SHA1 = hs.SHA1.Result(); - if (DoSHA256 == true) - CheckSums[NewFileName].SHA256 = hs.SHA256.Result(); - if (DoSHA512 == true) - CheckSums[NewFileName].SHA512 = hs.SHA512.Result(); + hs.AddFD(fd, 0, DoHashes); + CheckSums[NewFileName].Hashes = hs.GetHashStringList(); fd.Close(); return true; @@ -1083,54 +1092,29 @@ bool ReleaseWriter::DoPackage(string FileName) /*}}}*/ // ReleaseWriter::Finish - Output the checksums /*{{{*/ // --------------------------------------------------------------------- -void ReleaseWriter::Finish() +static void printChecksumTypeRecord(FILE * const Output, char const * const Type, map<string, ReleaseWriter::CheckSum> const &CheckSums) { - if (DoMD5 == true) - { - fprintf(Output, "MD5Sum:\n"); - for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); - I != CheckSums.end(); ++I) - { - fprintf(Output, " %s %16llu %s\n", - (*I).second.MD5.c_str(), - (*I).second.size, - (*I).first.c_str()); - } - } - if (DoSHA1 == true) - { - fprintf(Output, "SHA1:\n"); - for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); - I != CheckSums.end(); ++I) - { - fprintf(Output, " %s %16llu %s\n", - (*I).second.SHA1.c_str(), - (*I).second.size, - (*I).first.c_str()); - } - } - if (DoSHA256 == true) - { - fprintf(Output, "SHA256:\n"); - for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); + fprintf(Output, "%s:\n", Type); + for(map<string,ReleaseWriter::CheckSum>::const_iterator I = CheckSums.begin(); I != CheckSums.end(); ++I) { + HashString const * const hs = I->second.Hashes.find(Type); + if (hs == NULL) + continue; fprintf(Output, " %s %16llu %s\n", - (*I).second.SHA256.c_str(), + hs->HashValue().c_str(), (*I).second.size, (*I).first.c_str()); } - } - - fprintf(Output, "SHA512:\n"); - for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); - I != CheckSums.end(); - ++I) - { - fprintf(Output, " %s %16llu %s\n", - (*I).second.SHA512.c_str(), - (*I).second.size, - (*I).first.c_str()); - } - +} +void ReleaseWriter::Finish() +{ + if ((DoHashes & Hashes::MD5SUM) == Hashes::MD5SUM) + printChecksumTypeRecord(Output, "MD5Sum", CheckSums); + if ((DoHashes & Hashes::SHA1SUM) == Hashes::SHA1SUM) + printChecksumTypeRecord(Output, "SHA1", CheckSums); + if ((DoHashes & Hashes::SHA256SUM) == Hashes::SHA256SUM) + printChecksumTypeRecord(Output, "SHA256", CheckSums); + if ((DoHashes & Hashes::SHA512SUM) == Hashes::SHA512SUM) + printChecksumTypeRecord(Output, "SHA512", CheckSums); } diff --git a/ftparchive/writer.h b/ftparchive/writer.h index d8a10e0bb..226996475 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -13,6 +13,8 @@ #ifndef WRITER_H #define WRITER_H +#include <apt-pkg/hashes.h> + #include <string> #include <stdio.h> #include <iostream> @@ -61,10 +63,7 @@ class FTWScanner } public: - bool DoMD5; - bool DoSHA1; - bool DoSHA256; - bool DoSHA512; + unsigned int DoHashes; unsigned long DeLinkLimit; string InternalPrefix; @@ -197,17 +196,14 @@ public: string PathPrefix; string DirStrip; -protected: struct CheckSum { - string MD5; - string SHA1; - string SHA256; - string SHA512; + HashStringList Hashes; // Limited by FileFd::Size() unsigned long long size; ~CheckSum() {}; }; +protected: map<string,struct CheckSum> CheckSums; }; diff --git a/methods/server.cc b/methods/server.cc index 5a13f18a7..c91d3b218 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -392,9 +392,16 @@ bool ServerMethod::Fetch(FetchItem *) for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; I = I->Next, Depth++) { - // If pipelining is disabled, we only queue 1 request - if (Server->Pipeline == false && Depth >= 0) - break; + if (Depth >= 0) + { + // If pipelining is disabled, we only queue 1 request + if (Server->Pipeline == false) + break; + // if we have no hashes, do at most one such request + // as we can't fixup pipeling misbehaviors otherwise + else if (I->ExpectedHashes.usable() == false) + break; + } // Make sure we stick with the same server if (Server->Comp(I->Uri) == false) @@ -546,7 +553,38 @@ int ServerMethod::Loop() // Send status to APT if (Result == true) { - Res.TakeHashes(*Server->GetHashes()); + Hashes * const resultHashes = Server->GetHashes(); + HashStringList const hashList = resultHashes->GetHashStringList(); + if (PipelineDepth != 0 && Queue->ExpectedHashes.usable() == true && Queue->ExpectedHashes != hashList) + { + // we did not get the expected hash… mhhh: + // could it be that server/proxy messed up pipelining? + FetchItem * BeforeI = Queue; + for (FetchItem *I = Queue->Next; I != 0 && I != QueueBack; I = I->Next) + { + if (I->ExpectedHashes.usable() == true && I->ExpectedHashes == hashList) + { + // yes, he did! Disable pipelining and rewrite queue + if (Server->Pipeline == true) + { + // FIXME: fake a warning message as we have no proper way of communicating here + std::string out; + strprintf(out, _("Automatically disabled %s due to incorrect response from server/proxy. (man 5 apt.conf)"), "Acquire::http::PipelineDepth"); + std::cerr << "W: " << out << std::endl; + Server->Pipeline = false; + // we keep the PipelineDepth value so that the rest of the queue can be fixed up as well + } + Rename(Res.Filename, I->DestFile); + Res.Filename = I->DestFile; + BeforeI->Next = I->Next; + I->Next = Queue; + Queue = I; + break; + } + BeforeI = I; + } + } + Res.TakeHashes(*resultHashes); URIDone(Res); } else diff --git a/methods/server.h b/methods/server.h index 0f45ab994..5299b3954 100644 --- a/methods/server.h +++ b/methods/server.h @@ -140,7 +140,7 @@ class ServerMethod : public pkgAcqMethod virtual ServerState * CreateServerState(URI uri) = 0; virtual void RotateDNS() = 0; - ServerMethod(const char *Ver,unsigned long Flags = 0) : pkgAcqMethod(Ver, Flags), Server(NULL), File(NULL), PipelineDepth(0), AllowRedirect(false), Debug(false) {}; + ServerMethod(const char *Ver,unsigned long Flags = 0) : pkgAcqMethod(Ver, Flags), Server(NULL), File(NULL), PipelineDepth(10), AllowRedirect(false), Debug(false) {}; virtual ~ServerMethod() {}; }; @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -161,9 +161,9 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -283,6 +283,7 @@ msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" @@ -310,19 +311,19 @@ msgstr "تعذر قَفْل دليل التنزيل" msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -330,151 +331,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -525,11 +526,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -733,9 +734,9 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "خطأ في القراءة" @@ -748,9 +749,9 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1061,108 +1062,108 @@ msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1170,27 +1171,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1199,7 +1200,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1207,21 +1208,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1230,6 +1231,14 @@ msgstr "" msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1291,7 +1300,7 @@ msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" @@ -1382,7 +1391,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" @@ -1426,7 +1435,7 @@ msgid "" msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1434,22 +1443,63 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "حزم معطوبة" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s هي النسخة الأحدث.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1458,23 +1508,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "تثبيت هذه الحزم دون التحقق منها؟" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -1673,7 +1723,7 @@ msgid "The diversion path is too long" msgstr "" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "" @@ -2016,27 +2066,27 @@ msgstr "تعذرت الكتابة إلى %s" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." @@ -2055,35 +2105,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2091,24 +2141,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2177,19 +2227,19 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "فشل إغلاق الملف %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2578,44 +2628,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2749,40 +2799,40 @@ msgstr "" msgid "Could not open file descriptor %d" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2998,31 +3048,31 @@ msgstr "تعذر إنشاء %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "قائمة توسيعات الحزمة طويلة جداً" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "خطأ في معالجة الدليل %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "قائمة توسيعات المصدر طويلة جداً" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "خطأ في معالجة المحتويات %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3064,41 +3114,46 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "لم تُطابق أية تحديدات" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "تعذرت إزالة %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "" @@ -3163,31 +3218,31 @@ msgstr "*** فشل ربط %s بـ%s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" @@ -3263,7 +3318,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3320,38 +3375,9 @@ msgstr "" #~ msgstr "الحزمة %s ليس لها مرشح تثبيت" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s هي النسخة الأحدث.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" - #~ msgid "MD5Sum mismatch" #~ msgstr "MD5Sum غير متطابقة" @@ -3359,9 +3385,6 @@ msgstr "" #~ msgid "Skipping nonexistent file %s" #~ msgstr "فتح ملف التهيئة %s" -#~ msgid "Failed to remove %s" -#~ msgstr "تعذرت إزالة %s" - #~ msgid "Failed to change to the admin dir %sinfo" #~ msgstr "فشل تغيير دليل الإدارة إلى %sinfo" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -154,9 +154,9 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -326,6 +326,7 @@ msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" @@ -353,12 +354,12 @@ msgstr "Nun pue bloquiase'l direutoriu de descarga" msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -367,7 +368,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -379,97 +380,97 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +479,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +488,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +504,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +513,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -631,11 +632,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -839,9 +840,9 @@ msgstr "Gandió'l tiempu de conexón" msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Fallu de llectura" @@ -854,9 +855,9 @@ msgid "Protocol corruption" msgstr "Corrupción del protocolu" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Fallu d'escritura" @@ -1170,108 +1171,108 @@ msgstr "Habríes d'executar 'apt-get -f install' para igualo." msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumplíes. Téntalo usando -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " o" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1279,27 +1280,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1308,7 +1309,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1316,21 +1317,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1339,6 +1340,14 @@ msgstr "Error de compilación d'espresión regular - %s" msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1401,7 +1410,7 @@ msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" @@ -1498,7 +1507,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" @@ -1545,7 +1554,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseña una solución)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1557,22 +1566,63 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paquetes frañaos" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paquetes encamentaos" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s yá ta na versión más nueva.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Esbillada la versión %s (%s) pa %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Esbillada la versión %s (%s) pa %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1586,23 +1636,23 @@ msgstr "" " asina que nun dependen de la pertinencia de la verdadera situación " "actual!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Avisu d'autenticación saltáu.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "¿Instalar esos paquetes ensin verificación?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" @@ -1804,7 +1854,7 @@ msgid "The diversion path is too long" msgstr "La trayeutoria de desviación ye enforma llarga" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" @@ -2152,27 +2202,27 @@ msgstr "Nun se pue escribir en %s" msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar caché d'oríxenes" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falló'l cambiu de nome, %s (%s -> %s)." @@ -2190,35 +2240,35 @@ msgstr "El tamañu nun concasa" msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2228,12 +2278,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2242,12 +2292,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2322,7 +2372,7 @@ msgstr "Nun s'entiende'l tipu de pin %s" msgid "No priority (or zero) specified for pin" msgstr "Nun hai prioridá (o ye cero) conseñada pa pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2331,12 +2381,12 @@ msgstr "" "Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2745,20 +2795,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2766,7 +2816,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2774,7 +2824,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2782,7 +2832,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2791,7 +2841,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2931,40 +2981,40 @@ msgstr "Nun se pudo abrir el ficheru %s" msgid "Could not open file descriptor %d" msgstr "Nun pudo abrise un ficheru descriptor %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nun pudo criase'l soprocesu IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nun pudo executase'l compresor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -3196,31 +3246,31 @@ msgstr "Nun ye a lleer %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "La llista d'estensión de paquetes ye enforma llarga" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Error al procesar el direutoriu %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "La llista d'estensión de fontes ye enforma llarga" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Error al escribir la cabecera al ficheru de conteníos" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Error al procesar conteníos %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3301,26 +3351,26 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afita una escoyeta de configuración propia" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nun concasó denguna seleición" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La BD corrompiose, ficheru renomáu como %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La DB ye antigua, tentando actualizar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3328,16 +3378,21 @@ msgstr "" "El formatu de la base de datos nun ye válidu. Si anovaste dende una versión " "anterior d'apt, desanicia y recrea la base de datos." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nun pudo abrise'l ficheru de BD %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nun pudo lleese l'enllaz %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "L'archivu nun tien rexistru de control" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nun pudo algamase un cursor" @@ -3402,31 +3457,31 @@ msgstr "*** Falló enllazar enllazr %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzose'l llímite of %sB de desenllaz.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nun pudo allugase memoria" @@ -3502,7 +3557,7 @@ msgstr "Nun pudo lleese al computar MD5" msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3614,36 +3669,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Los paquetes virtuales como '%s' nun pueden desaniciase\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota, escoyendo %s nel llugar de %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s yá ta na versión más nueva.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Esbillada la versión %s (%s) pa %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Esbillada la versión %s (%s) pa %s\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Inorar release destín non disponible '%s' pal paquete '%s'" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -328,6 +328,7 @@ msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" @@ -357,12 +358,12 @@ msgstr "Неуспех при заключването на директория msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +373,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -384,80 +385,80 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,18 +467,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +487,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +496,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +512,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +521,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -638,11 +639,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -866,9 +867,9 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Грешка при четене" @@ -881,9 +882,9 @@ msgid "Protocol corruption" msgstr "Развален протокол" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Грешка при запис" @@ -1204,108 +1205,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " или" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1313,27 +1314,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1342,7 +1343,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1350,21 +1351,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1373,6 +1374,14 @@ msgstr "Грешка при компилирането на регулярния msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1437,7 +1446,7 @@ msgstr "След тази операция ще бъде освободено %s msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" @@ -1534,7 +1543,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" @@ -1580,7 +1589,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1592,22 +1601,66 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Счупени пакети" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Пропускане на %s, който не е инсталиран при заявени само обновявания.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s вече е най-новата версия.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Избрана е версия %s (%s) за %s\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид " +"„%s“?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1620,23 +1673,23 @@ msgstr "" " Заключването е деактивирано, така че не разчитайте\n" " на повтаряемост в реална ситуация." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Инсталиране на тези пакети без проверка?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -1835,7 +1888,7 @@ msgid "The diversion path is too long" msgstr "Пътят за отклонение е твърде дълъг" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" @@ -2186,29 +2239,29 @@ msgstr "Неуспех при записа на %s" msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Подготовка за приемане на решение" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" "Външната програма за удовлетворяване на зависимости се провали без да изведе " "съобщение за грешка" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." @@ -2226,7 +2279,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2235,16 +2288,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2253,12 +2306,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2268,12 +2321,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2282,12 +2335,12 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2361,7 +2414,7 @@ msgstr "Неизвестен тип за отбиване %s" msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2370,12 +2423,12 @@ msgstr "" "Неуспех при незабавната настройка на „%s“. За повече информация вижте " "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2791,22 +2844,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2814,7 +2867,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2822,7 +2875,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2830,7 +2883,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2839,7 +2892,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2983,41 +3036,41 @@ msgstr "Неуспех при отварянето на файла %s" msgid "Could not open file descriptor %d" msgstr "Неуспех при отварянето на файлов манипулатор %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "грешка при четене, все още има %llu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -3251,31 +3304,31 @@ msgstr "Неуспех при получаването на атрибути з msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Списъкът с разширения на пакети и твърде дълъг" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Грешка при обработката на директория %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Списъкът с разширения на източници е твърде дълъг" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Грешка при запазването на заглавната част във файла със съдържание" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Грешка при обработката на съдържание %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3360,26 +3413,26 @@ msgstr "" " -c=? Четене на този конфигурационен файл.\n" " -o=? Настройване на произволна конфигурационна опция" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Няма съвпадения на избора" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е повредена, файлът е преименуван на %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3387,16 +3440,21 @@ msgstr "" "Невалиден формат на БД. Ако сте обновили от по-стара версия на apt, " "премахнете базата от данни и я създайте наново." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Неуспех при прочитането на връзка %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" @@ -3461,31 +3519,31 @@ msgstr "*** Неуспех при създаването на връзка %s к msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" @@ -3561,7 +3619,7 @@ msgstr "Неуспех при четене докато се изчислява msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3671,37 +3729,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Виртуални пакети като „%s“ не могат да се премахват\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте " -#~ "предвид „%s“?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Избиране на „%s“ вместо „%s“\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Пропускане на %s, който не е инсталиран при заявени само обновявания.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s вече е най-новата версия.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Избрана е версия %s (%s) за %s\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Игнориране на несъществуващо издание „%s“ на пакета „%s“" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -156,9 +156,9 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -289,6 +289,7 @@ msgid "Couldn't find package %s" msgstr "" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" @@ -316,19 +317,19 @@ msgstr "" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -336,151 +337,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -530,11 +531,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -736,9 +737,9 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Greška pri čitanju" @@ -752,9 +753,9 @@ msgid "Protocol corruption" msgstr "Oštećenje protokola" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Greška pri pisanju" @@ -1065,135 +1066,135 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1202,7 +1203,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1210,21 +1211,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1233,6 +1234,14 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1294,7 +1303,7 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -1380,7 +1389,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "" @@ -1422,7 +1431,7 @@ msgid "" "solution)." msgstr "" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1430,22 +1439,63 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Oštećeni paketi" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Preporučeni paketi:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1454,24 +1504,24 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -1665,7 +1715,7 @@ msgid "The diversion path is too long" msgstr "" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "" @@ -2009,27 +2059,27 @@ msgstr "Ne mogu zapisati na %s" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" @@ -2046,35 +2096,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2082,24 +2132,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2168,19 +2218,19 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Ne mogu otvoriti %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2570,44 +2620,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2741,40 +2791,40 @@ msgstr "" msgid "Could not open file descriptor %d" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "" @@ -2991,31 +3041,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3057,41 +3107,46 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokušavam nadogradnju %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Ne mogu ukloniti %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "" @@ -3156,31 +3211,31 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "" @@ -3256,7 +3311,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3298,9 +3353,6 @@ msgstr "" #~ msgid "However the following packages replace it:" #~ msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#~ msgid "Failed to remove %s" -#~ msgstr "Ne mogu ukloniti %s" - #~ msgid "Reading file listing" #~ msgstr "Čitam spisak datoteke" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -158,9 +158,9 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -328,6 +328,7 @@ msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" @@ -358,12 +359,12 @@ msgstr "No és possible blocar el directori de descàrrega" msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, 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:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -373,7 +374,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -385,81 +386,81 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, 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:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -468,18 +469,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +489,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +498,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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 instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +514,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +523,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -642,11 +643,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -850,9 +851,9 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Error de lectura" @@ -865,9 +866,9 @@ msgid "Protocol corruption" msgstr "Protocol corromput" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Error d'escriptura" @@ -1186,108 +1187,108 @@ msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " o" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1295,27 +1296,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1324,7 +1325,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1332,21 +1333,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1355,6 +1356,14 @@ msgstr "S'ha produït un error de compilació de l'expressió regular - %s" msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1421,7 +1430,7 @@ msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" @@ -1520,7 +1529,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" @@ -1567,7 +1576,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1579,22 +1588,67 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paquets trencats" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paquets recomanats:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ja es troba en la versió més recent.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versió seleccionada «%s» (%s) per a «%s»\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir " +"«%s»?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1607,23 +1661,23 @@ msgstr "" " Tingueu en ment que el bloqueig està desactivat,\n" " per tant, no es depèn de la situació actual real." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -1825,7 +1879,7 @@ msgid "The diversion path is too long" msgstr "La ruta de desviació és massa llarga" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" @@ -2179,27 +2233,27 @@ msgstr "No es pot escriure en %s" msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Envia l'escenari al resoledor" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Envia la petició al resoledor" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Prepara per a rebre una solució" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "El resoledor extern ha fallat sense un missatge d'error adient" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Executa un resoledor extern" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." @@ -2217,7 +2271,7 @@ msgstr "La mida no concorda" msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2226,16 +2280,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2244,12 +2298,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2260,12 +2314,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2275,12 +2329,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2355,7 +2409,7 @@ msgstr "No s'ha entès el pin de tipus %s" msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2364,12 +2418,12 @@ msgstr "" "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." "conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2783,20 +2837,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2804,7 +2858,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2812,7 +2866,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2820,7 +2874,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2829,7 +2883,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2974,40 +3028,40 @@ msgstr "No s'ha pogut obrir el fitxer %s" msgid "Could not open file descriptor %d" msgstr "No s'ha pogut obrir el descriptor del fitxer %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "llegits, falten %llu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escrits, falten %llu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -3238,31 +3292,31 @@ msgstr "No es pot veure l'estat de %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "S'ha produït un error en processar el directori %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3343,26 +3397,26 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3370,16 +3424,21 @@ msgstr "" "El format de la base de dades és invàlid. Si heu actualitzat des d'una " "versió més antiga de l'apt, suprimiu i torneu a crear la base de dades." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "No s'ha pogut llegir l'enllaç %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" @@ -3444,31 +3503,31 @@ msgstr "*** No s'ha pogut enllaçar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" @@ -3544,7 +3603,7 @@ msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3654,39 +3713,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Els paquets virtuals com «%s» no es poden suprimir\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir " -#~ "«%s»?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "S'està ometent %s, ja està instaŀlat i l'actualització no està " -#~ "establerta.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "S'està ometent '%s', no està instaŀlat i només es demana " -#~ "l'actualització.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ja es troba en la versió més recent.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versió seleccionada «%s» (%s) per a «%s»\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -155,9 +155,9 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -320,6 +320,7 @@ msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" @@ -349,12 +350,12 @@ msgstr "Nelze zamknout adresář pro stahování" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -363,7 +364,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -374,80 +375,80 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, 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:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -456,17 +457,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -475,20 +476,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -497,7 +498,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +507,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -621,11 +622,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -848,9 +849,9 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Chyba čtení" @@ -863,9 +864,9 @@ msgid "Protocol corruption" msgstr "Porušení protokolu" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Chyba zápisu" @@ -1179,108 +1180,108 @@ msgstr "Pro opravení můžete spustit „apt-get -f install“." msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1288,27 +1289,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1317,7 +1318,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1325,21 +1326,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1348,6 +1349,15 @@ msgstr "Chyba při kompilaci regulárního výrazu - %s" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1411,7 +1421,7 @@ msgstr "Po této operaci bude na disku uvolněno %sB.\n" msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" @@ -1511,7 +1521,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" @@ -1559,7 +1569,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1570,22 +1580,66 @@ 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." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Poškozené balíky" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Doporučované balíky:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze " +"aktualizace.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s je již nejnovější verze.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Vybraná verze „%s“ (%s) pro „%s“\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1598,23 +1652,23 @@ msgstr "" " Mějte také na paměti, že je vypnuto zamykání, tudíž\n" " tyto výsledky nemusí mít s realitou nic společného!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Instalovat tyto balíky bez ověření?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -1811,7 +1865,7 @@ msgid "The diversion path is too long" msgstr "Diverzní cesta je příliš dlouhá" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nelze vyhodnotit %s" @@ -2155,27 +2209,27 @@ msgstr "Nelze zapsat do %s" msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Scénář odeslán řešiteli" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Požadavek odeslán řešiteli" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Příprava na obdržení řešení" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Spuštění externího řešitele" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." @@ -2193,7 +2247,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2202,16 +2256,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2220,12 +2274,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2235,12 +2289,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2249,12 +2303,12 @@ msgstr "" "Nebylo možné 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2328,7 +2382,7 @@ msgstr "Nerozumím vypíchnutí typu %s" msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2337,12 +2391,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2741,21 +2795,21 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2763,7 +2817,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2771,7 +2825,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2779,7 +2833,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2788,7 +2842,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2924,40 +2978,40 @@ msgstr "Nelze otevřít soubor %s" msgid "Could not open file descriptor %d" msgstr "Nelze otevřít popisovač souboru %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nelze vytvořit podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, stále mám %llu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -3186,31 +3240,31 @@ msgstr "Nelze vyhodnotit %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Chyba zpracování adresáře %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3290,26 +3344,26 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3317,16 +3371,21 @@ msgstr "" "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " "prosím odstraňte a poté ji znovu vytvořte." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nelze otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nelze přečíst link %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nelze získat kurzor" @@ -3391,31 +3450,31 @@ msgstr "*** Nezdařilo se slinkovat %s s %s" msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" @@ -3491,7 +3550,7 @@ msgstr "Chyba čtení při výpočtu MD5" msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3600,36 +3659,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuální balíky jako „%s“ nemohou být odstraněny\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Pozn: Vybírám „%s“ místo „%s“\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "Přeskakuji %s, protože je již nainstalován.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze " -#~ "aktualizace.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s je již nejnovější verze.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Vybraná verze „%s“ (%s) pro „%s“\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignoruje se nedostupné vydání „%s“ balíku „%s“" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -174,9 +174,9 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -348,6 +348,7 @@ msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" @@ -376,19 +377,19 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -396,96 +397,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, 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:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, 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:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +495,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +504,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +520,7 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,32 +529,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -645,11 +646,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -858,9 +859,9 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Gwall darllen" @@ -873,9 +874,9 @@ msgid "Protocol corruption" msgstr "Llygr protocol" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1197,111 +1198,111 @@ msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1311,27 +1312,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1340,7 +1341,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1348,21 +1349,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1371,6 +1372,14 @@ msgstr "Gwall crynhoi patrwm - %s" msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1434,7 +1443,7 @@ msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" @@ -1526,7 +1535,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" @@ -1573,7 +1582,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1585,22 +1594,63 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, 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" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1609,25 +1659,25 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -1831,7 +1881,7 @@ msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" @@ -2188,27 +2238,27 @@ msgstr "Ni ellir ysgrifennu i %s" msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." @@ -2227,7 +2277,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2235,28 +2285,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2264,13 +2314,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2279,12 +2329,12 @@ 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2360,20 +2410,20 @@ msgstr "Methwyd daeall y math pin %s" msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2783,44 +2833,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2954,42 +3004,42 @@ msgstr "Methwyd agor ffeil %s" msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -3223,32 +3273,32 @@ msgstr "Ni ellir gwneud stat() o %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -3330,41 +3380,46 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" @@ -3430,31 +3485,31 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -3532,7 +3587,7 @@ msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" # FIXME: "debian" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3628,40 +3683,9 @@ msgstr "" #~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" - -#, fuzzy -#~ 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" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#~ 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" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2013-12-14 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -161,9 +161,9 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -333,6 +333,7 @@ msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" @@ -362,12 +363,12 @@ msgstr "Kunne ikke låse nedhentningsmappen" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -376,7 +377,7 @@ msgstr "" "BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -387,78 +388,78 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil »%s«\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,17 +468,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +486,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +494,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +510,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +519,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -634,11 +635,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -877,9 +878,9 @@ msgstr "Tidsudløb på forbindelsen" msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Læsefejl" @@ -892,9 +893,9 @@ msgid "Protocol corruption" msgstr "Protokolfejl" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Skrivefejl" @@ -1212,105 +1213,105 @@ msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«." msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, fuzzy, c-format msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1318,27 +1319,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1347,7 +1348,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1355,21 +1356,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1378,6 +1379,14 @@ msgstr "Fejl ved tolkning af regulært udtryk - %s" msgid "The update command takes no arguments" msgstr "»update«-kommandoen benytter ingen parametre" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1440,7 +1449,7 @@ msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" @@ -1539,7 +1548,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" @@ -1585,7 +1594,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv " "en løsning)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1596,22 +1605,63 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Ødelagte pakker" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Anbefalede pakker:" +#: apt-private/private-install.cc:815 +#, fuzzy, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#: apt-private/private-install.cc:836 +#, fuzzy, c-format +msgid "%s is already the newest version.\n" +msgstr "%s var allerede sat i bero.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1624,23 +1674,23 @@ msgstr "" " Husk også at låsning er deaktiveret,\n" " så stol ikke på relevansen for den reelle aktuelle situation!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Installér disse pakker uden verifikation?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -1842,7 +1892,7 @@ msgid "The diversion path is too long" msgstr "Omrokeringsstien er for lang" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" @@ -2187,27 +2237,27 @@ msgstr "Kunne ikke skrive til %s" msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Send scenarie til problemløser" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Send forespørgsel til problemløser" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Forbered for modtagelse af løsning" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Kør ekstern problemløser" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." @@ -2224,7 +2274,7 @@ msgstr "Størrelsen stemmer ikke" msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2233,17 +2283,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2252,12 +2302,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2267,12 +2317,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2281,12 +2331,12 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2359,7 +2409,7 @@ msgstr "Kunne ikke forstå pin-type %s" msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2368,12 +2418,12 @@ msgstr "" "Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." "conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2777,21 +2827,21 @@ msgstr "Er /dev/pts monteret?" msgid "Is stdout a terminal?" msgstr "Er standardud en terminal?" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2799,14 +2849,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2814,7 +2864,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -2822,7 +2872,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " "system" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" @@ -2957,40 +3007,40 @@ msgstr "Kunne ikke åbne filen %s" msgid "Could not open file descriptor %d" msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Kunne ikke oprette underproces IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Kunne ikke udføre komprimeringsprogram " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "læs, mangler stadig at læse %llu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -3219,31 +3269,31 @@ msgstr "Kunne ikke finde %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Pakkeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Fejl under behandling af mappen %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Kildeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Fejl under skrivning af hovedet til indholdsfil" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3323,26 +3373,26 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Sæt en opsætnings-indstilling" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Ingen valg passede" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen »%s«" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var ødelagt, filen omdøbt til %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsøger at opgradere %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3350,16 +3400,21 @@ msgstr "" "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af " "apt, så fjern og genskab databasen." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke åbne DB-filen %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Kunne ikke »readlink« %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markør" @@ -3424,32 +3479,32 @@ msgstr "*** Kunne ikke lænke %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " Nåede DeLink-begrænsningen på %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "" " %s har ingen linje med tilsidesættelse af standard for binøre filer\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Kunne ikke allokere hukommelse" @@ -3525,7 +3580,7 @@ msgstr "Kunne ikke læse under beregning af MD5" msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -335,6 +335,7 @@ msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" @@ -366,12 +367,12 @@ msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -381,7 +382,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -393,80 +394,80 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -475,18 +476,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +496,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +505,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -521,7 +522,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -530,30 +531,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -655,11 +656,11 @@ msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -888,9 +889,9 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Lesefehler" @@ -903,9 +904,9 @@ msgid "Protocol corruption" msgstr "Protokoll beschädigt" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Schreibfehler" @@ -1232,109 +1233,109 @@ msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." msgid "Unmet dependencies. Try using -f." msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installiert]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1342,27 +1343,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1371,7 +1372,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1379,21 +1380,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1402,6 +1403,14 @@ msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente." +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1465,7 +1474,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." @@ -1564,7 +1573,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" @@ -1614,7 +1623,7 @@ msgstr "" "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " "eines Pakets (oder geben Sie eine Lösung an)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1626,22 +1635,71 @@ msgstr "" "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" "nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Beschädigte Pakete" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht " +"angefordert.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind " +"angefordert.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"Erneute Installation von %s ist nicht möglich,\n" +"es kann nicht heruntergeladen werden.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ist schon die neueste Version.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Version »%s« (%s) für »%s« gewählt.\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie " +"»%s«?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1655,23 +1713,23 @@ msgstr "" " sind, verlassen Sie sich also bezüglich des reellen aktuellen\n" " Status der Sperre nicht darauf!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden." -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Diese Pakete ohne Überprüfung installieren?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -1873,7 +1931,7 @@ msgid "The diversion path is too long" msgstr "Der Umleitungspfad ist zu lang." #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s mit »stat« abfragen fehlgeschlagen" @@ -2232,28 +2290,28 @@ msgstr "Schreiben nach %s nicht möglich" msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Szenario an Problemlöser senden" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Anfrage an Problemlöser senden" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Vorbereiten, eine Lösung zu erhalten" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" "Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen." -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Externen Problemlöser ausführen" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." @@ -2271,7 +2329,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2280,17 +2338,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2299,12 +2357,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2315,12 +2373,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2330,14 +2388,14 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2414,7 +2472,7 @@ msgstr "Pinning-Typ %s kann nicht interpretiert werden." msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2423,12 +2481,12 @@ msgstr "" "»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." "conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2841,22 +2899,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2864,7 +2922,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2872,7 +2930,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2880,7 +2938,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2889,7 +2947,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3035,44 +3093,44 @@ msgstr "Datei %s konnte nicht geöffnet werden." msgid "Could not open file descriptor %d" msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Fehler beim Ausführen von Komprimierer " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -3305,31 +3363,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Paketerweiterungsliste ist zu lang." -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang." -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhalte %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3416,26 +3474,26 @@ msgstr "" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurationsoption setzen" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Keine Auswahl traf zu" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«." -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern." -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3444,16 +3502,21 @@ msgstr "" "einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " "und erstellen Sie sie neu." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink von %s fehlgeschlagen" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Archiv hat keinen Steuerungsdatensatz." -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Unmöglich, einen Cursor zu bekommen" @@ -3518,31 +3581,31 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archiv hatte kein Feld »package«" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Betreuer ist %s und nicht %s.\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Speicheranforderung fehlgeschlagen" @@ -3618,7 +3681,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3730,41 +3793,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden.\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten " -#~ "Sie »%s«?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt.\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht " -#~ "angefordert.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s wird übersprungen; es ist nicht installiert und lediglich Upgrades " -#~ "sind angefordert.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "Erneute Installation von %s ist nicht möglich,\n" -#~ "es kann nicht heruntergeladen werden.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ist schon die neueste Version.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Version »%s« (%s) für »%s« gewählt.\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -334,6 +334,7 @@ msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" @@ -361,19 +362,19 @@ msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -381,116 +382,116 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,37 +500,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -623,11 +624,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -832,9 +833,9 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -847,9 +848,9 @@ msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1165,108 +1166,108 @@ msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད msgid "Unmet dependencies. Try using -f." msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1274,27 +1275,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1303,7 +1304,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1311,21 +1312,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1334,6 +1335,14 @@ msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོ msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1399,7 +1408,7 @@ msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" @@ -1491,7 +1500,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" @@ -1536,7 +1545,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1547,22 +1556,67 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" +"འབད་བས།\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" +"འབད་བས།\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1571,24 +1625,24 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 #, fuzzy msgid "Install these packages without verification?" msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -1791,7 +1845,7 @@ msgid "The diversion path is too long" msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" @@ -2138,27 +2192,27 @@ msgstr " %sལུ་འབྲི་མ་ཚུགས།" msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" @@ -2177,35 +2231,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2213,12 +2267,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2227,12 +2281,12 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2306,19 +2360,19 @@ msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འ msgid "No priority (or zero) specified for pin" msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2716,44 +2770,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2888,40 +2942,40 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "Could not open file descriptor %d" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -3147,31 +3201,31 @@ msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚ msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3255,26 +3309,26 @@ msgstr "" " -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3283,16 +3337,21 @@ msgstr "" "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" "པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། " -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" @@ -3357,31 +3416,31 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" @@ -3457,7 +3516,7 @@ msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པ msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3557,42 +3616,9 @@ msgstr "" #~ msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་" -#~ "མ་འབད་བས།\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་" -#~ "མ་འབད་བས།\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "འ་ནི་འདི་ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ འདི་ལུ་'%s'ཡང་ན་'%s'འཐུས་མི་མིན་འདུག" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -167,9 +167,9 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -340,6 +340,7 @@ msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" @@ -371,19 +372,19 @@ msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -391,96 +392,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +490,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +498,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +514,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +523,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -637,11 +638,11 @@ msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -845,9 +846,9 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -860,9 +861,9 @@ msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1183,108 +1184,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " η" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1292,27 +1293,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1321,7 +1322,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1329,21 +1330,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1352,6 +1353,14 @@ msgstr "σφάλμα μεταγλωτισμου - %s" msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1417,7 +1426,7 @@ msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερ msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" @@ -1512,7 +1521,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" @@ -1558,7 +1567,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1570,22 +1579,68 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν οριστεί.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " +"του\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1594,23 +1649,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -1813,7 +1868,7 @@ msgid "The diversion path is too long" msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." @@ -2165,27 +2220,27 @@ msgstr "Αδύνατη η εγγραφή στο %s" msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." @@ -2203,35 +2258,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2239,12 +2294,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2253,12 +2308,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2333,19 +2388,19 @@ msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2743,44 +2798,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2917,40 +2972,40 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "Could not open file descriptor %d" msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -3179,31 +3234,31 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3287,26 +3342,26 @@ msgstr "" " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3315,16 +3370,21 @@ msgstr "" "Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " "έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Αποτυχία ανάγνωσης του %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" @@ -3389,31 +3449,31 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s" msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" @@ -3489,7 +3549,7 @@ msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3589,40 +3649,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Εικονικά πακέτα όπως το '%s' δεν μπορούν να αφαιρεθούν\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε " -#~ "'%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Σημείωση, επιλέχθηκε το %s αντί του %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν " -#~ "οριστεί.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " -#~ "του\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" #~ "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, δεν περιέχει το μέλος '%s', '%s' ή " @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -212,9 +212,9 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -388,6 +388,7 @@ msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" @@ -416,12 +417,12 @@ msgstr "No se puede bloquear el directorio de descarga" msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, 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:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -431,7 +432,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -443,97 +444,97 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -542,7 +543,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -551,14 +552,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -567,7 +568,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -576,30 +577,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -695,11 +696,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -903,9 +904,9 @@ msgstr "La conexión expiró" msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Error de lectura" @@ -918,9 +919,9 @@ msgid "Protocol corruption" msgstr "Fallo del protocolo" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Error de escritura" @@ -1236,108 +1237,108 @@ msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo." msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " o" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1345,27 +1346,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1374,7 +1375,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1382,21 +1383,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1405,6 +1406,14 @@ msgstr "Error de compilación de expresiones regulares - %s" msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1471,7 +1480,7 @@ msgstr "Se liberarán %sB después de esta operación.\n" msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" @@ -1569,7 +1578,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" @@ -1618,7 +1627,7 @@ msgstr "" "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " "especifique una solución)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1630,22 +1639,65 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paquetes rotos" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paquetes recomendados:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Ignorando %s, no está instalado y sólo se están solicitando " +"actualizaciones.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ya está en su versión más reciente.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versión seleccionada «%s» (%s) para «%s»\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versión seleccionada «%s» (%s) para «%s»\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "El paquete %s no está instalado, no se eliminará\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "El paquete %s no está instalado, no se eliminará\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1658,23 +1710,23 @@ msgstr "" " Tenga también en cuenta que se han desactivado los bloqueos,\n" " ¡no dependa de la relevancia a la situación real actual!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticación ignorado.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "¿Instalar estos paquetes sin verificación?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -1877,7 +1929,7 @@ msgid "The diversion path is too long" msgstr "La trayectoria de desviación es demasiado larga" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" @@ -2230,27 +2282,27 @@ msgstr "No se puede escribir en %s" msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." @@ -2268,37 +2320,37 @@ msgstr "El tamaño difiere" msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2309,12 +2361,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2324,12 +2376,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2404,7 +2456,7 @@ msgstr "No se entiende el pin tipo %s" msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2414,12 +2466,12 @@ msgstr "" "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más " "información. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2836,22 +2888,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2859,7 +2911,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2867,7 +2919,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2875,7 +2927,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2884,7 +2936,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3024,40 +3076,40 @@ msgstr "No pude abrir el fichero %s" msgid "Could not open file descriptor %d" msgstr "No se pudo abrir el descriptor de fichero %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Se produjo un problema al renombrar el fichero %s a %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -3293,31 +3345,31 @@ msgstr "No pude leer %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "La lista de extensión de paquetes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Error procesando el directorio %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "La lista de extensión de fuentes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3402,26 +3454,26 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Ninguna selección coincide" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD dañada, se renombró el archivo a %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3429,16 +3481,21 @@ msgstr "" "El formato de la base de datos no es válido. Debe eliminar y recrear la base " "de datos si vd. se actualizó de una versión anterior de apt." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "No se pudo leer el enlace %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" @@ -3503,31 +3560,31 @@ msgstr "*** No pude enlazar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al límite de %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" @@ -3603,7 +3660,7 @@ msgstr "No se pudo leer mientras se computaba MD5" msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3717,39 +3774,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "No pueden eliminarse los paquetes virtuales como «%s»\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "El paquete %s no está instalado, no se eliminará\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "El paquete %s no está instalado, no se eliminará\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota, seleccionando «%s» en lugar de «%s»\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Ignorando %s, ya está instalado y no está activada la actualización.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Ignorando %s, no está instalado y sólo se están solicitando " -#~ "actualizaciones.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ya está en su versión más reciente.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versión seleccionada «%s» (%s) para «%s»\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versión seleccionada «%s» (%s) para «%s»\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "Ignorar la distribución objetivo no disponible «%s» del paquete «%s»" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -330,6 +330,7 @@ msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" @@ -357,19 +358,19 @@ msgstr "Ezin da deskarga direktorioa blokeatu" msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -377,97 +378,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -475,7 +476,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -483,14 +484,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,7 +500,7 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -507,30 +508,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -622,11 +623,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -833,9 +834,9 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Irakurketa errorea" @@ -848,9 +849,9 @@ msgid "Protocol corruption" msgstr "Protokolo hondatzea" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Idazketa errorea" @@ -1166,108 +1167,108 @@ msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1275,27 +1276,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1304,7 +1305,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[B/e]" @@ -1312,21 +1313,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1335,6 +1336,14 @@ msgstr "Adierazpen erregularren konpilazio errorea - %s" msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1398,7 +1407,7 @@ msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" @@ -1491,7 +1500,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" @@ -1544,7 +1553,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1556,22 +1565,63 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s bertsiorik berriena da jada.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1580,23 +1630,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Paketeak egiaztapen gabe instalatu?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -1797,7 +1847,7 @@ msgid "The diversion path is too long" msgstr "Desbideratzearen bidea luzeegia da" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" @@ -2142,27 +2192,27 @@ msgstr "%s : ezin da idatzi" msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." @@ -2180,35 +2230,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2216,12 +2266,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2230,12 +2280,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2309,19 +2359,19 @@ msgstr "Ez da ulertu %s orratz-mota (pin)" msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2718,44 +2768,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2892,40 +2942,40 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "Could not open file descriptor %d" msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -3153,31 +3203,31 @@ msgstr "Ezin da daturik lortu %s(e)tik" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Pakete luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Errorea direktorioa prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Iturburu luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Errorea eduki fitxategiaren goiburua idaztean" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3256,26 +3306,26 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3284,16 +3334,21 @@ msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " "mesedez datubasea ezabatu eta birsortu." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Huts egin du %s esteka irakurtzean" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol erregistrorik" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" @@ -3358,31 +3413,31 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" @@ -3458,7 +3513,7 @@ msgstr "Huts egin du MD5 konputatzean" msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3557,38 +3612,9 @@ msgstr "" #~ msgstr "%s paketeak ez du instalatzeko hautagairik" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s bertsiorik berriena da jada.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" #~ "Hau ez da baliozko DEB fitxategi bat, ez du '%s', '%s' edo '%s' atalik " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -158,9 +158,9 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -327,6 +327,7 @@ msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" @@ -354,19 +355,19 @@ msgstr "Noutokansiota ei saatu lukittua" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -374,96 +375,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -471,7 +472,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -479,14 +480,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,7 +496,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -503,30 +504,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -617,11 +618,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -825,9 +826,9 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Lukuvirhe" @@ -840,9 +841,9 @@ msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1158,108 +1159,108 @@ msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1267,27 +1268,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1296,7 +1297,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[K/e]" @@ -1304,21 +1305,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1327,6 +1328,14 @@ msgstr "Käännösvirhe lausekkeessa - %s" msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1389,7 +1398,7 @@ msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" @@ -1484,7 +1493,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" @@ -1537,7 +1546,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1548,22 +1557,63 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Suositellut paketit:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s on jo uusin versio.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Valittiin versio %s (%s) paketille %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Valittiin versio %s (%s) paketille %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1572,23 +1622,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Asennetaanko nämä paketit ilman todennusta?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -1790,7 +1840,7 @@ msgid "The diversion path is too long" msgstr "Korvautuspolku on liian pitkä" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" @@ -2138,27 +2188,27 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu" msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." @@ -2176,35 +2226,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2212,12 +2262,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2226,12 +2276,12 @@ 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2305,19 +2355,19 @@ msgstr "Tunnistetyyppi %s on tuntematon" msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2712,44 +2762,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2883,40 +2933,40 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "Could not open file descriptor %d" msgstr "Putkea %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -3141,32 +3191,32 @@ msgstr "Tiedostolle %s ei toimi stat" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3248,26 +3298,26 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3276,16 +3326,21 @@ msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " "on tietokanta poistettava ja luotava uudelleen." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink %s ei onnistunut" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" @@ -3350,31 +3405,31 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut" msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" @@ -3450,7 +3505,7 @@ msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3548,39 +3603,9 @@ msgstr "" #~ msgstr "Paketilla %s ei ole asennettavaa valintaa" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Huomautus, valitaan %s eikä %s\n" -#~ 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" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s on jo uusin versio.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Valittiin versio %s (%s) paketille %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Valittiin versio %s (%s) paketille %s\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" #~ "Tämä ei ole kelvollinen DEB-arkisto, jokin osista \"%s\", \"%s\" tai \"%s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2013-08-17 07:57+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -157,9 +157,9 @@ msgid " Version table:" msgstr " Table de version :" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -342,6 +342,7 @@ msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" @@ -373,12 +374,12 @@ msgstr "Impossible de verrouiller le répertoire de téléchargement" msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, 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:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -388,7 +389,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -400,80 +401,80 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -483,17 +484,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -502,7 +503,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -511,14 +512,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -527,7 +528,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -536,31 +537,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -655,11 +656,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -891,9 +892,9 @@ msgstr "Dépassement du délai de connexion" msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Erreur de lecture" @@ -906,9 +907,9 @@ msgid "Protocol corruption" msgstr "Corruption du protocole" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Erreur d'écriture" @@ -1230,108 +1231,108 @@ msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèm msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installé]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1340,27 +1341,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1369,7 +1370,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[O/n]" @@ -1377,21 +1378,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1400,6 +1401,14 @@ msgstr "Erreur de compilation de l'expression rationnelle - %s" msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas de paramètre" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1465,7 +1474,7 @@ msgstr "Après cette opération, %so d'espace disque seront libérés.\n" msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" @@ -1571,7 +1580,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " @@ -1621,7 +1630,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1633,22 +1642,68 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paquets défectueux" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paquets recommandés :" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s ignoré : il n'est pas installé et seules des mises à jour ont été " +"demandées.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s est déjà la plus récente version disponible.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Version choisie « %s » (%s) pour « %s »\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" +"être vouliez-vous écrire « %s » ?\n" + +#: apt-private/private-install.cc:937 +#, 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" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1663,23 +1718,23 @@ msgstr "" " et la situation n'est donc pas forcément représentative\n" " de la réalité !" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignoré.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Faut-il installer ces paquets sans vérification ?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -1881,7 +1936,7 @@ msgid "The diversion path is too long" msgstr "Le chemin de déviation est trop long" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" @@ -2241,27 +2296,27 @@ msgid "IO Error saving source cache" msgstr "" "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Envoi du scénario au solveur" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Envoi d'une requête au solveur" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Préparation à la réception de la solution" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Échec du solveur externe sans message d'erreur adapté" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Exécu tion du solveur externe" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." @@ -2279,7 +2334,7 @@ msgstr "Taille incohérente" msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2288,18 +2343,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2308,12 +2363,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2324,12 +2379,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2338,14 +2393,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2423,7 +2478,7 @@ msgstr "Type d'épinglage %s inconnu" msgid "No priority (or zero) specified for pin" msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2433,12 +2488,12 @@ msgstr "" "consulter la page de manuel apt.conf(5) et notamment la section à propos de " "APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Impossible de configurer « %s »." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2865,20 +2920,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2886,14 +2941,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2901,7 +2956,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2909,7 +2964,7 @@ msgid "" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3059,40 +3114,40 @@ msgstr "Impossible d'ouvrir le fichier %s" msgid "Could not open file descriptor %d" msgstr "Impossible d'ouvrir le descripteur de fichier %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Impossible de créer un sous-processus IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Impossible d'exécuter la compression " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -3327,31 +3382,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Erreur lors du traitement du répertoire %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3434,27 +3489,27 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Aucune sélection ne correspond" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, 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 »" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Base de données corrompue, fichier renommé en %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Base de données ancienne, tentative de mise à jour de %s\"" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3462,16 +3517,21 @@ msgstr "" "Le format de la base de données n'est pas valable. Si vous mettez APT à " "jour, veuillez supprimer puis recréer la base de données." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Impossible de lire le lien %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "L'archive n'a pas d'enregistrement de contrôle" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" @@ -3536,31 +3596,31 @@ msgstr "*** Impossible de lier %s à %s" msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s ne possède pas d'entrée « source override »\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ne possède pas également pas d'entrée « binary override »\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Échec de l'allocation de mémoire" @@ -3636,7 +3696,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5" msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3751,40 +3811,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" -#~ "être vouliez-vous écrire « %s » ?\n" - -#~ 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" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Note : sélection de « %s » au lieu de « %s »\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s ignoré : il n'est pas installé et seules des mises à jour ont été " -#~ "demandées.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s est déjà la plus récente version disponible.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Version choisie « %s » (%s) pour « %s »\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "La distribution cible « %s » indisponible pour le paquet « %s » est " @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -333,6 +333,7 @@ msgid "Couldn't find package %s" msgstr "Non foi posíbel atopar o paquete %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" @@ -360,12 +361,12 @@ msgstr "Non é posíbel bloquear o directorio de descargas" msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -374,7 +375,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -386,97 +387,97 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +486,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +495,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +511,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +520,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -640,11 +641,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -848,9 +849,9 @@ msgstr "Esgotouse o tempo para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Produciuse un erro de lectura" @@ -863,9 +864,9 @@ msgid "Protocol corruption" msgstr "Dano no protocolo" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Produciuse un erro de escritura" @@ -1185,108 +1186,108 @@ msgstr "Pode querer executar «apt-get -f install» para corrixilos." msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1294,27 +1295,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1323,7 +1324,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1331,21 +1332,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1354,6 +1355,14 @@ msgstr "Produciuse un erro na compilación da expresión regular - %s" msgid "The update command takes no arguments" msgstr "A orde «update» non toma argumentos" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1419,7 +1428,7 @@ msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre abondo en %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Xurdiron problemas e empregouse -y sen --force-yes" @@ -1519,7 +1528,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a solucionar a situación:" @@ -1567,7 +1576,7 @@ msgstr "" "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " "especifique unha solución)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1580,22 +1589,63 @@ msgstr "" "algúns paquetes solicitados aínda non se creasen ou que se movesen da " "entrada." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paquetes estragados" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paquetes suxeridos:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paquetes recomendados:" +#: apt-private/private-install.cc:815 +#, 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 anovación.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s xa é a versión máis recente.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versión seleccionada «%s» (%s) para «%s»\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "O paquete %s non está instalado, así que non foi retirado\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "O paquete %s non está instalado, así que non foi retirado\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1609,23 +1659,23 @@ msgstr "" " Lembre tamén que o bloqueo está desactivado,\n" " polo que non debe depender da relevancia da situación actual real." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Non se poden autenticar os seguintes paquetes!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Non foi posíbel autenticar algúns paquetes" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Instalar estes paquetes sen verificación?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" @@ -1825,7 +1875,7 @@ msgid "The diversion path is too long" msgstr "A ruta do desvío é longa de máis" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Non foi posíbel determinar o estado %s" @@ -2176,27 +2226,27 @@ msgstr "Non é posíbel escribir en %s" msgid "IO Error saving source cache" msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." @@ -2214,7 +2264,7 @@ msgstr "Os tamaños non coinciden" msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2223,29 +2273,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2256,12 +2306,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2270,12 +2320,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2351,7 +2401,7 @@ msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2360,12 +2410,12 @@ msgstr "" "Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf " "baixo APT::Immediate-Configure para obter máis detalles. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2778,22 +2828,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2801,7 +2851,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2809,7 +2859,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2817,7 +2867,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2826,7 +2876,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2970,40 +3020,40 @@ msgstr "Non foi posíbel abrir o ficheiro %s" msgid "Could not open file descriptor %d" msgstr "Non foi posíbel abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Non foi posíbel crear o IPC do subproceso" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Non foi posíbel executar o compresor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -3238,31 +3288,31 @@ msgstr "Non é posíbel determinar o estado %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "A lista de extensións de paquetes é longa de máis" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Produciuse un erro ao procesar o directorio %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "A lista de extensións de fontes é longa de máis" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Produciuse un erro ao procesar o contido %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3345,26 +3395,26 @@ msgstr "" " -c=? Le este ficheiro de configuración\n" " -o=? Estabelece unha opción de configuración" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Non coincide ningunha selección" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, tentando anovar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3372,16 +3422,21 @@ msgstr "" "O formato da base de datos non é correcto. Se a anovou desde unha versión " "antiga de apt, retirea e volva a crear a base de datos" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Non foi posíbel ler a ligazón %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Non é posíbel obter un cursor" @@ -3446,31 +3501,31 @@ msgstr "*** Non foi posíbel ligar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " Acadouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de «override»\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de «override» de código fonte\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de «override» de binarios\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Non foi posíbel reservar memoria" @@ -3546,7 +3601,7 @@ msgstr "Non foi posíbel ler ao calcular o MD5" msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3659,36 +3714,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Non se poden retirar os paquetes virtuais como «%s»\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "O paquete %s non está instalado, así que non foi retirado\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "O paquete %s non está instalado, así que non foi retirado\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota, seleccione «%s» no canto de «%s»\n" -#~ 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 anovación.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s xa é a versión máis recente.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versión seleccionada «%s» (%s) para «%s»\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorase a versión de destino «%s» non dispoñíbel do paquete «%s»" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -327,6 +327,7 @@ msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésűre állítva.\n" @@ -357,12 +358,12 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +373,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -383,80 +384,80 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, 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:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 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:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +466,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, 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:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +485,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +494,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +510,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +519,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -636,11 +637,11 @@ msgid "Must specify at least one pair url/filename" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -868,9 +869,9 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Olvasási hiba" @@ -883,9 +884,9 @@ msgid "Protocol corruption" msgstr "Protokollhiba" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Írási hiba" @@ -1200,108 +1201,108 @@ msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javítás msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbálja a -f használatával." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1309,27 +1310,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1338,7 +1339,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[I/n]" @@ -1346,21 +1347,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1369,6 +1370,14 @@ msgstr "Regex fordítási hiba - %s" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1430,7 +1439,7 @@ msgstr "A művelet után %sB lemezterület szabadul fel.\n" msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül" @@ -1527,7 +1536,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információk segíthetnek megoldani a problémát:" @@ -1575,7 +1584,7 @@ msgstr "" "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot " "csomagok nélkül (vagy telepítse a függőségeket is!)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1587,22 +1596,64 @@ msgstr "" "használja, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Törött csomagok" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s már a legújabb verzió.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1615,23 +1666,23 @@ msgstr "" " Ne feledje, hogy a zárolás is ki van kapcsolva,\n" " így ne számítson a jelenlegi helyzet valósságára!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetés felülbírálva.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -1830,7 +1881,7 @@ msgid "The diversion path is too long" msgstr "Az eltérített útvonal túl hosszú" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" @@ -2180,27 +2231,27 @@ msgstr "Nem lehet írni ebbe: %s" msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "A helyzet elküldése a solvernek" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Kérés küldése a solvernek" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Felkészülés megoldás fogadására" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Külső solver végrehajtása" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." @@ -2218,7 +2269,7 @@ msgstr "A méret nem megfelelő" msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2227,16 +2278,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2245,12 +2296,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2260,12 +2311,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2274,12 +2325,12 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2353,7 +2404,7 @@ msgstr "A(z) %s rögzítéstípus nem értelmezhető" msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2362,12 +2413,12 @@ msgstr "" "Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért " "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "A(z) „%s” beállítása sikertelen" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2780,20 +2831,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2801,7 +2852,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2809,7 +2860,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2817,7 +2868,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -2825,7 +2876,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren " "lévő hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2970,40 +3021,40 @@ msgstr "Nem lehet megnyitni a(z) %s fájlt" msgid "Could not open file descriptor %d" msgstr "Nem lehet megnyitni a(z) %d fájlleírót" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "olvasás, még kellene %llu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "írás, még kiírandó %llu, de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -3236,31 +3287,31 @@ msgstr "%s nem érhető el" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Hiba a tartalomfájl fejlécének írásakor" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3342,26 +3393,26 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A DB megsérült, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A DB régi, kísérlet a következő frissítésére: %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3369,16 +3420,21 @@ msgstr "" "Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról " "frissített, akkor távolítsa el, és hozza létre újra az adatbázist." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink nem hajtható végre erre: %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" @@ -3443,31 +3499,31 @@ msgstr "*** %s linkelése sikertelen ehhez: %s" msgid " DeLink limit of %sB hit.\n" msgstr " a DeLink korlátja (%sB) elérve.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" @@ -3543,7 +3599,7 @@ msgstr "Olvasási hiba az MD5 kiszámításakor" msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3653,37 +3709,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "A virtuális csomagokat, mint a(z) „%s” nem lehet eltávolítani\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: " -#~ "„%s”?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Megjegyzés: „%s” kijelölése „%s” helyett\n" -#~ 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" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s már a legújabb verzió.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "A(z) „%2$s” csomag el nem érhető „%1$s” cél kiadásának figyelmen kívül " @@ -1,24 +1,24 @@ # Italian translation of apt -# Copyright (C) 2002-2010, 2011, 2012, 2013 The Free Software Foundation, Inc. +# Copyright (C) 2002-2010, 2011, 2012, 2013, 2014 The Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon <samu@debian.org>, 2002. -# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012, 2013. +# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" -"PO-Revision-Date: 2013-08-27 22:06+0200\n" -"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" +"PO-Revision-Date: 2014-05-31 17:04+0100\n" +"Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.6.5\n" #: cmdline/apt-cache.cc:149 #, c-format @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -255,7 +255,6 @@ msgid "Failed to mount '%s' to '%s'" msgstr "Mount di \"%s\" su \"%s\" non riuscito" #: cmdline/apt-cdrom.cc:178 -#, fuzzy msgid "" "No CD-ROM could be auto-detected or found using the default mount point.\n" "You may try the --cdrom option to set the CD-ROM mount point.\n" @@ -265,8 +264,8 @@ msgstr "" "Impossibile rilevare automaticamente un CD-ROM oppure è stato trovato con " "il\n" "punto di mount predefinito.\n" -"È possibile provare l'opzione --cdrom per impostare il punto di mount del\n" -"CD-ROM. Per maggiori informazioni sull'autorilevamento e sul punto di mount\n" +"Provare l'opzione --cdrom per impostare il punto di mount del CD-ROM.\n" +"Per maggiori informazioni sull'autorilevamento e sul punto di mount\n" "del CD-ROM, consultare \"man apt-cdrom\"." #: cmdline/apt-cdrom.cc:182 @@ -306,22 +305,19 @@ msgstr "" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" #: cmdline/apt-get.cc:245 -#, fuzzy, c-format +#, c-format msgid "Can not find a package for architecture '%s'" -msgstr "" -"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" +msgstr "Impossibile trovare un pacchetto per l'architettura \"%s\"" #: cmdline/apt-get.cc:327 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with version '%s'" -msgstr "" -"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" +msgstr "Impossibile trovare un pacchetto \"%s\" con versione \"%s\"" #: cmdline/apt-get.cc:330 -#, fuzzy, c-format +#, c-format msgid "Can not find a package '%s' with release '%s'" -msgstr "" -"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" +msgstr "Impossibile trovare un pacchetto \"%s\" con release \"%s\"" #: cmdline/apt-get.cc:367 #, c-format @@ -329,9 +325,9 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n" #: cmdline/apt-get.cc:423 -#, fuzzy, c-format +#, c-format msgid "Can not find version '%s' of package '%s'" -msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\"" +msgstr "Impossibile trovare la versione \"%s\" del pacchetto \"%s\"" #: cmdline/apt-get.cc:454 #, c-format @@ -339,6 +335,7 @@ msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" @@ -369,12 +366,12 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -384,7 +381,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -396,80 +393,80 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -478,17 +475,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt." "conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -497,7 +494,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -506,14 +503,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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 recente" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -522,7 +519,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -531,30 +528,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -645,16 +642,14 @@ msgstr "" " Questo APT ha i poteri della Super Mucca.\n" #: cmdline/apt-helper.cc:35 -#, fuzzy msgid "Must specify at least one pair url/filename" -msgstr "" -"È necessario specificare almeno un pacchetto di cui recuperare il sorgente" +msgstr "È necessario specificare almeno una coppia URL/nome file" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" -msgstr "" +msgstr "Scaricamento non riuscito" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -666,6 +661,15 @@ msgid "" "\n" " This APT helper has Super Meep Powers.\n" msgstr "" +"Uso: apt-helper [OPZIONI] COMANDO\n" +" apt-helper [OPZIONI] download-file uri percorso\n" +"\n" +"apt-helper è un programma d'aiuto interno per apt\n" +"\n" +"Comandi:\n" +" download-file Scarica l'URI fornito in percorso\n" +"\n" +" Questo APT ha super poteri.\n" #: cmdline/apt-mark.cc:68 #, c-format @@ -713,7 +717,6 @@ msgid "Executing dpkg failed. Are you root?" msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?" #: cmdline/apt-mark.cc:392 -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -743,12 +746,17 @@ msgstr "" "\n" "apt-mark è una semplice interfaccia a riga di comando per segnalare i " "pacchetti\n" -"come installati manualmente o automaticamente. Può anche elencare le \n" +"come installati manualmente o automaticamente. Può anche elencare le " "segnalazioni.\n" "\n" "Comandi:\n" -" auto Segna i pacchetti forniti come installati automaticamente\n" -" manual Segna i pacchetti forniti come installati manualmente\n" +" auto Segna i pacchetti forniti come installati automaticamente\n" +" manual Segna i pacchetti forniti come installati manualmente\n" +" hold Segna un pacchetto come bloccato a una vecchia versione\n" +" unhold Sblocca un pacchetto bloccato a una vecchia versione\n" +" showauto Stampa l'elenco dei pacchetti installati automaticamente\n" +" showmanual Stampa l'elenco dei pacchetti installati manualmente\n" +" showhold Stampa l'elenco dei pacchetti bloccati\n" "\n" "Opzioni:\n" " -h Mostra questo aiuto\n" @@ -782,6 +790,25 @@ msgid "" "\n" " edit-sources - edit the source information file\n" msgstr "" +"Uso: apt [OPZIONI] COMANDO\n" +"\n" +"Interfaccia a riga di comando per apt.\n" +"Comandi di base:\n" +" list Elenca i pacchetti in base al nome\n" +" search Cerca tra le descrizioni dei pacchetti\n" +" show Mostra dettagli di un pacchetto\n" +"\n" +" update Aggiorna l'elenco dei pacchetti disponibili\n" +"\n" +" install Installa pacchetti\n" +" remove Rimuove pacchetti\n" +"\n" +" upgrade Esegue l'avanzamento di versione del sistema installando e\n" +" aggiornando i pacchetti\n" +" full-upgrade Esegue l'avanzamento di versione del sistema rimuovendo,\n" +" installando e aggiornando i pacchetti\n" +"\n" +" edit-sources Modifica il file sulle informazioni delle sorgenti\n" #: methods/cdrom.cc:203 #, c-format @@ -881,9 +908,9 @@ msgstr "Connessione scaduta" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Errore di lettura" @@ -896,9 +923,9 @@ msgid "Protocol corruption" msgstr "Protocollo danneggiato" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Errore di scrittura" @@ -1167,9 +1194,8 @@ msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " #: apt-private/private-upgrade.cc:30 -#, fuzzy msgid "Internal error, Upgrade broke stuff" -msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" +msgstr "Errore interno, Upgrade ha rovinato qualche cosa" #: apt-private/private-upgrade.cc:32 msgid "Done" @@ -1177,19 +1203,19 @@ msgstr "Eseguito" #: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 msgid "Sorting" -msgstr "" +msgstr "Ordinamento" #: apt-private/private-list.cc:131 msgid "Listing" -msgstr "" +msgstr "Elencazione" #: apt-private/private-list.cc:164 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla" +msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle" #: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." @@ -1219,108 +1245,105 @@ msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò." msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" -msgstr "" +msgstr "sconosciuto" -#: apt-private/private-output.cc:232 -#, fuzzy, c-format +#: apt-private/private-output.cc:233 +#, c-format msgid "[installed,upgradable to: %s]" -msgstr " [Installato]" +msgstr "[installato, aggiornabile a: %s]" -#: apt-private/private-output.cc:236 -#, fuzzy +#: apt-private/private-output.cc:237 msgid "[installed,local]" -msgstr " [Installato]" +msgstr "[installato, locale]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" -msgstr "" +msgstr "[installato, auto-rimovibile]" -#: apt-private/private-output.cc:241 -#, fuzzy +#: apt-private/private-output.cc:242 msgid "[installed,automatic]" -msgstr " [Installato]" +msgstr "[installato, automatico]" -#: apt-private/private-output.cc:243 -#, fuzzy +#: apt-private/private-output.cc:244 msgid "[installed]" -msgstr " [Installato]" +msgstr "[installato]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" -msgstr "" +msgstr "[aggiornabile da: %s]" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" -msgstr "" +msgstr "[configurazione residua]" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1329,27 +1352,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1358,7 +1381,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1366,21 +1389,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1389,17 +1412,25 @@ msgstr "Errore di compilazione dell'espressione regolare - %s" msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo" +msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli" #: apt-private/private-show.cc:163 msgid "not a real package (virtual)" -msgstr "" +msgstr "non un vero pacchetto (virtuale)" #: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1454,7 +1485,7 @@ msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" msgid "You don't have enough free space in %s." msgstr "Spazio libero in %s insufficiente." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" @@ -1554,7 +1585,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" @@ -1605,7 +1636,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1617,22 +1648,68 @@ msgstr "" "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n" "non sono ancora stati creati o sono stati rimossi da Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Viene saltato %s poiché non è installato e sono richiesti solo gli " +"aggiornamenti.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s è già alla versione più recente.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si " +"intendeva \"%s\"?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1645,40 +1722,41 @@ msgstr "" " Inoltre, il meccanismo di blocco non è attivato e non è quindi\n" " utile dare importanza a tutto ciò per una situazione reale." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Alcuni pacchetti non possono essere autenticati" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Installare questi pacchetti senza verificarli?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" #: apt-private/private-sources.cc:58 -#, fuzzy, c-format +#, c-format msgid "Failed to parse %s. Edit again? " -msgstr "Rinomina di %s in %s non riuscita" +msgstr "Analisi di %s non riuscita: modificare nuovamente?" #: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" +"Il proprio file \"%s\" è stato modificato: eseguire \"apt-get update\"." #: apt-private/private-search.cc:51 msgid "Full Text Search" -msgstr "" +msgstr "Ricerca sul testo" #: apt-private/acqprogress.cc:66 msgid "Hit " @@ -1867,7 +1945,7 @@ msgid "The diversion path is too long" msgstr "Il percorso della deviazione è troppo lungo" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Impossibile eseguire stat su %s" @@ -1984,7 +2062,7 @@ msgstr "Impossibile eseguire stat su %s." #: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" -msgstr "" +msgstr "Avanzamento: [%3i%%]" #: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" @@ -2036,9 +2114,9 @@ msgid "The method driver %s could not be found." msgstr "Impossibile trovare un driver per il metodo %s." #: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format +#, c-format msgid "Is the package %s installed?" -msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" +msgstr "Il pacchetto %s è installato?" #: apt-pkg/acquire-worker.cc:169 #, c-format @@ -2219,27 +2297,27 @@ msgstr "Impossibile scrivere in %s" msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvare la cache sorgente" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Invia lo scenario al solver" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Invia la richiesta al solver" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Preparazione alla ricezione della soluzione" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Il solver esterno è terminato senza un errore di messaggio" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Esecuzione solver esterno" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() non riuscita: %s (%s -> %s)." @@ -2253,11 +2331,10 @@ msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" #: apt-pkg/acquire-item.cc:173 -#, fuzzy msgid "Invalid file format" -msgstr "Operazione %s non valida" +msgstr "Formato file non valido" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2266,17 +2343,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2285,12 +2362,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2300,12 +2377,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2314,14 +2391,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2400,7 +2477,7 @@ msgstr "Impossibile comprendere il tipo di gancio %s" msgid "No priority (or zero) specified for pin" msgstr "Priorità per il gancio non specificata (o zero)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2410,12 +2487,12 @@ msgstr "" "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" "Immediate-Configure\" (%d)." -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2590,10 +2667,9 @@ msgstr "" "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" #: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by glob '%s'" -msgstr "" -"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" +msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\"" #: apt-pkg/cacheset.cc:626 #, c-format @@ -2657,9 +2733,9 @@ msgid "Invalid 'Date' entry in Release file %s" msgstr "Voce \"Date\" nel file Release %s non valida" #: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format +#, c-format msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "La riga %lu nel file %s non è corretta (URI parse)" +msgstr "La stanza %u nel file delle sorgenti %s non è corretta (analisi URI)" #: apt-pkg/sourcelist.cc:170 #, c-format @@ -2734,12 +2810,13 @@ msgstr "La riga %u nel file %s non è corretta (type)" #: apt-pkg/sourcelist.cc:375 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" +msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file delle sorgenti %s" #: apt-pkg/sourcelist.cc:416 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" +msgstr "" +"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s" #: apt-pkg/deb/dpkgpm.cc:95 #, c-format @@ -2824,37 +2901,37 @@ msgstr "Pacchetto %s rimosso completamente" #: apt-pkg/deb/dpkgpm.cc:1066 msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" +msgstr "ioctl(TIOCGWINSZ) non riuscita" #: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090 -#, fuzzy, c-format +#, c-format msgid "Can not write log (%s)" -msgstr "Impossibile scrivere in %s" +msgstr "Impossibile scrivere il registro (%s)" #: apt-pkg/deb/dpkgpm.cc:1069 msgid "Is /dev/pts mounted?" -msgstr "" +msgstr "È /dev/pts montato?" #: apt-pkg/deb/dpkgpm.cc:1090 msgid "Is stdout a terminal?" -msgstr "" +msgstr "stdout è un terminale?" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2862,7 +2939,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2870,29 +2947,28 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore di memoria esaurita" +"errore di memoria esaurita." -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 -#, fuzzy +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore per disco pieno." +"errore nel sistema locale." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore di I/O di dpkg" +"errore di I/O di dpkg." #: apt-pkg/deb/debsystem.cc:91 #, c-format @@ -3035,40 +3111,40 @@ msgstr "Impossibile aprire il file %s" msgid "Could not open file descriptor %d" msgstr "Impossibile aprire il descrittore del file %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Creazione di un sottoprocesso IPC non riuscita" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Esecuzione non riuscita del compressore " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -3297,39 +3373,39 @@ msgstr "" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format +#, c-format msgid "Unable to mkstemp %s" -msgstr "Impossibile eseguire stat su %s" +msgstr "Impossibile eseguire mkstemp %s" #: cmdline/apt-extracttemplates.cc:300 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare la versione di debconf. È installato?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Errore nell'elaborare la directory %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "L'elenco dell'estensione del sorgente è troppo lungo" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'elaborare i contenuti %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3410,26 +3486,26 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Il database era danneggiato, il file è stato rinominato in %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il database è vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3437,16 +3513,21 @@ msgstr "" "Il formato del database non è valido. Se è stato eseguito l'aggiornamento da " "una vecchia versione di apt, rimuovere e ricreare il database." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file del database %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Esecuzione di readlink su %s non riuscita" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "L'archivio non ha un campo \"control\"" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" @@ -3514,31 +3595,31 @@ msgstr "*** Collegamento di %s a %s non riuscito" msgid " DeLink limit of %sB hit.\n" msgstr " Raggiunto il limite di DeLink di %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "L'archivio non ha un campo \"package\"" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " il responsabile di %s è %s non %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ha un campo source override\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s non ha neppure un campo binario override\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Allocazione della memoria non riuscita" @@ -3550,9 +3631,9 @@ msgstr "Impossibile aprire %s" #. skip spaces #. find end of word #: ftparchive/override.cc:68 -#, fuzzy, c-format +#, c-format msgid "Malformed override %s line %llu (%s)" -msgstr "Override %s riga %llu malformato #1" +msgstr "Override %s riga %llu malformato (%s)" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format @@ -3614,7 +3695,7 @@ msgstr "Lettura durante l'elaborazione MD5 non riuscita" msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3724,40 +3805,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si " -#~ "intendeva \"%s\"?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Viene saltato %s poiché è già installato e l'aggiornamento non è " -#~ "impostato.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Viene saltato %s poiché non è installato e sono richiesti solo gli " -#~ "aggiornamenti.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "La reinstallazione di %s non è possibile, non può essere scaricato.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s è già alla versione più recente.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\"" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.16.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2014-03-21 19:53+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -157,9 +157,9 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -330,6 +330,7 @@ msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" @@ -360,12 +361,12 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +376,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -387,80 +388,80 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -469,17 +470,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." "conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -488,7 +489,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +498,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +514,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +523,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -641,11 +642,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "ダウンロード失敗" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -902,9 +903,9 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "読み込みエラー" @@ -917,9 +918,9 @@ msgid "Protocol corruption" msgstr "プロトコルが壊れています" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "書き込みエラー" @@ -1235,105 +1236,105 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "不明" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[インストール済み、%s にアップグレード可]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 msgid "[installed,local]" msgstr "[インストール済み、ローカル]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "[インストール済み、自動削除可]" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 msgid "[installed,automatic]" msgstr "[インストール済み、自動]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 msgid "[installed]" msgstr "[インストール済み]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "[%s からアップグレード可]" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "[設定未完了]" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " または" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1341,27 +1342,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1370,7 +1371,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1378,21 +1379,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1401,6 +1402,13 @@ msgstr "正規表現の展開エラー - %s" msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1463,7 +1471,7 @@ msgstr "この操作後に %sB のディスク容量が解放されます。\n" msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" @@ -1558,7 +1566,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" @@ -1603,7 +1611,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1615,22 +1623,63 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "壊れたパッケージ" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "推奨パッケージ:" +#: apt-private/private-install.cc:815 +#, fuzzy, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#: apt-private/private-install.cc:836 +#, fuzzy, c-format +msgid "%s is already the newest version.\n" +msgstr "%s はすでに保留に設定されています。\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1643,23 +1692,23 @@ msgstr "" " ロックが非アクティブであることから、今この時点の状態に妥当性が\n" " あるとは言い切れないことに注意してください!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "検証なしにこれらのパッケージをインストールしますか?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -1858,7 +1907,7 @@ msgid "The diversion path is too long" msgstr "diversion パスが長すぎます" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" @@ -2209,27 +2258,27 @@ msgstr "%s に書き込めません" msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "ソルバにシナリオを送信" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "ソルバにリクエストを送信" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "解決を受け取る準備" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "外部ソルバを実行" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" @@ -2246,7 +2295,7 @@ msgstr "サイズが適合しません" msgid "Invalid file format" msgstr "不正なファイル形式" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2255,16 +2304,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2273,14 +2322,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2290,12 +2339,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2304,12 +2353,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2386,7 +2435,7 @@ msgstr "pin タイプ %s を理解できませんでした" msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2395,12 +2444,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2808,20 +2857,20 @@ msgstr "/dev/pts はマウントされていますか?" msgid "Is stdout a terminal?" msgstr "標準出力はターミナルですか?" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2829,7 +2878,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2837,7 +2886,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2845,7 +2894,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -2853,7 +2902,7 @@ msgstr "" "エラーメッセージはローカルシステムの問題であることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2997,40 +3046,40 @@ msgstr "ファイル %s をオープンできませんでした" msgid "Could not open file descriptor %d" msgstr "ファイルデスクリプタ %d を開けませんでした" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "読み込みが %llu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -3259,31 +3308,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3364,26 +3413,26 @@ msgstr "" " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3391,16 +3440,21 @@ msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" "ベースを削除し、再作成してください。" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB ファイル %s を開くことができません: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s のリンク読み取りに失敗しました" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" @@ -3465,31 +3519,31 @@ msgstr "*** %s を %s にリンクするのに失敗しました" msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" @@ -3565,7 +3619,7 @@ msgstr "MD5 の計算中に読み込みに失敗しました" msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr " តារាងកំណែ ៖" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -332,6 +332,7 @@ msgid "Couldn't find package %s" msgstr "មិនអាចរកកញ្ចប់ %s បានទេ" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ %s នឹងត្រូវបានដំឡើង" @@ -359,19 +360,19 @@ msgstr "មិនអាចចាក់សោថតទាញយ msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់ត្រូវបញ្ជាក់កញ្ចប់មួយ ដើម្បីទៅប្រមូលយកប្រភពសម្រាប់" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "មិនអាចរកកញ្ចប់ប្រភពសម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -379,114 +380,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុងរំលងឯកសារដែលបានទាញយករួច '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិនអាចកំណត់ទំហំទំនេរក្នុង %s បានឡើយ" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នកពុំមានទំហំទំនេរគ្រប់គ្រាន់ទេនៅក្នុង %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការយក %sB/%sB នៃប័ណ្ណសារប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការយក %sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូលប្រភព %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "បរាជ័យក្នុងការទៅប្រមូលយកប័ណ្ណសារមួយចំនួន ។" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញយក ហើយតែក្នុងរបៀបទាញយកប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុងរំលងការស្រាយនៃប្រភពដែលបានស្រាយរួចនៅក្នុង %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យបញ្ជាស្រាយ '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យប្រសិនបើកញ្ចប់ 'dpkg-dev' មិនទាន់បានដំឡើង ។\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសងពាក្យបញ្ជា '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "ដំណើរការកូនបានបរាជ័យ" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែបញ្ជាក់យ៉ាងហោចណាស់មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិនអាចសាងសង់ព័ត៌មានភាពអស្រ័យសម្រាប់ %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យស្ថាបនាឡើយ ។\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យសម្រាប់ %s មិនអាចធ្វើឲ្យពេញចិត្ត ព្រោះរក %s កញ្ចប់មិនឃើញ " -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យសម្រាប់ %s មិនអាចធ្វើឲ្យពេញចិត្ត ព្រោះរក %s កញ្ចប់មិនឃើញ " -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +496,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាចតម្រូវចិត្តបានទេ ព្រោះ មិនមានកំណែនៃកញ្ចប់ %s ដែលអាចតម្រូវចិត្ត" "តម្រូវការកំណែបានឡើយ" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យសម្រាប់ %s មិនអាចធ្វើឲ្យពេញចិត្ត ព្រោះរក %s កញ្ចប់មិនឃើញ " -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យដែលបង្កើត %s មិនអាចបំពេញសេចក្ដីត្រូវការបានទេ ។" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "បានបរាជ័យក្នុងការដំណើរការបង្កើតភាពអាស្រ័យ" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុងតភ្ជាប់ទៅកាន់ %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "ម៉ូឌុលដែលគាំទ្រ ៖ " -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -615,11 +616,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "យ៉ាងហោចណាស់ត្រូវបញ្ជាក់កញ្ចប់មួយ ដើម្បីទៅប្រមូលយកប្រភពសម្រាប់" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -822,9 +823,9 @@ msgstr "អស់ពេលក្នុងការតភ្ជាប់" msgid "Server closed the connection" msgstr "ម៉ាស៊ីនបម្រើបានបិទការតភ្ជាប់" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "ការអានមានកំហុស" @@ -837,9 +838,9 @@ msgid "Protocol corruption" msgstr "ការបង្ខូចពិធីការ" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "ការសរសេរមានកំហុស" @@ -1151,108 +1152,108 @@ msgstr "អ្នកប្រហែលជាចង់រត់ 'apt-get msgid "Unmet dependencies. Try using -f." msgstr "ភាពអាស្រ័យដែលខុសគ្នា ។ ព្យាយាមការប្រើ -f ។" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់ខាងក្រោមមានភាពអាស្រ័យដែលខុសគ្នា ៖" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ %s ត្រូវបានដំឡើង" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ %s នឹងត្រូវបានដំឡើង" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ប៉ុន្តែវាមិនអាចដំឡើងបានទេ" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ប៉ុន្តែវាជាកញ្ចប់និម្មិត" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ប៉ុន្តែវាមិនបានដំឡើងទេ" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វានឹងមិនត្រូវបានដំឡើងទេ" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់ថ្មីខាងក្រោមនឹងត្រូវបានដំឡើង ៖" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានយកចេញ ៖" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "កញ្ចប់ខាងក្រោមត្រូវបានយកត្រឡប់មកវិញ ៖" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានធ្វើឲ្យប្រសើឡើង ៖" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់ខាងក្រោមនឹងត្រូវបានបន្ទាប ៖" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "កញ្ចប់រង់ចាំខាងក្រោមនឹងត្រូវបានផ្លាស់ប្តូរ ៖" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយសារតែ %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1260,27 +1261,27 @@ msgstr "" "ព្រមាន ៖ កញ្ចប់ដែលចាំបាច់ខាងក្រោមនឹងត្រូវបានយកចេញ ។\n" "ការយកចេញនេះមិនត្រូវបានធ្វើទេលុះត្រាតែអ្នកដឹងថាអ្នកកំពុងធ្វើអ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវបានធ្វើឲ្យប្រសើរ %lu ត្រូវបានដំឡើងថ្មី " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវបានដំឡើងឡើងវិញ " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវយកចេញ ហើយ %lu មិនបានធ្វើឲ្យប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិនបានដំឡើង ឬ យកចេញបានគ្រប់ជ្រុងជ្រោយឡើយ ។\n" @@ -1289,7 +1290,7 @@ msgstr "%lu មិនបានដំឡើង ឬ យកចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1297,21 +1298,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុសការចងក្រង - %s" @@ -1320,6 +1321,14 @@ msgstr "Regex កំហុសការចងក្រង - %s" msgid "The update command takes no arguments" msgstr "ពាក្យបញ្ជាដែលធ្វើឲ្យទាន់សម័យគ្មានអាគុយម៉ង់ទេ" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1381,7 +1390,7 @@ msgstr "បន្ទាប់ពីពន្លា %sB ទំហំ msgid "You don't have enough free space in %s." msgstr "អ្នកគ្មានទំហំទំនេរគ្រប់គ្រាន់ក្នុង %s ឡើយ ។" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "មានបញ្ហា ហើយ -y ត្រូវបានប្រើដោយគ្មាន --force-yes" @@ -1473,7 +1482,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មានដូចតទៅនេះ អាចជួយដោះស្រាយស្ថានភាពបាន ៖" @@ -1517,7 +1526,7 @@ msgid "" msgstr "" "ភាពអស្រ័យដែលខុសគ្នា ។ ព្យាយាម 'apt-get -f install' ដោយគ្មានកញ្ចប់ (ឬ បញ្ជាក់ដំណោះស្រាយ) ។" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1529,22 +1538,63 @@ msgstr "" "ដែលបានទាមទារនឹងមិនទាន់បានបង្កើតឡើយ\n" " ឬ បានយកចេញពីការមកដល់ ។" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "កញ្ចប់ដែលបានខូច" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់បន្ថែមដូចតទៅនេះ នឹងត្រូវបានដំឡើង ៖" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់យោបល់ ៖" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់អនុសាសន៍ ៖" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "កំពុងរំលង %s វាបានដំឡើងរួចរាល់ ហើយភាពធ្វើឲ្យប្រសើរមិនទាន់កំណត់ ។\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "កំពុងរំលង %s វាបានដំឡើងរួចរាល់ ហើយភាពធ្វើឲ្យប្រសើរមិនទាន់កំណត់ ។\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វាមិនអាចត្រូវបានទាញយកបានឡើយ ។\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ជាកំណែដែលថ្មីបំផុតរួចទៅហើយ ។\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "បានជ្រើសកំណែ %s (%s) សម្រាប់ %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "បានជ្រើសកំណែ %s (%s) សម្រាប់ %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "មិនទាន់បានដំឡើងកញ្ចប់ %s ទេ ដូច្នេះ មិនបានយកចេញឡើយ \n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "មិនទាន់បានដំឡើងកញ្ចប់ %s ទេ ដូច្នេះ មិនបានយកចេញឡើយ \n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1553,24 +1603,24 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ព្រមាន ៖ មិនអាចធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "បានបដិសេធការព្រមានការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ ។\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "មិនអាចផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់មួយចំនួនបានឡើយ" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 #, fuzzy msgid "Install these packages without verification?" msgstr "ដំឡើងកញ្ចប់ទាំងនេះ ដោយគ្មានការពិនិត្យបញ្ជាក់ [y/N] ? " -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" @@ -1769,7 +1819,7 @@ msgid "The diversion path is too long" msgstr "ផ្លូវបង្វែរ វែងពេក" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "បានបរាជ័យក្នុងការថ្លែង %s" @@ -2114,27 +2164,27 @@ msgstr "មិនអាចសរសេរទៅ %s" msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុកឃ្លាំងសម្ងាត់ប្រភព" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរឈ្មោះបានបរាជ័យ, %s (%s -> %s) ។" @@ -2153,35 +2203,35 @@ msgstr "ទំហំមិនបានផ្គួផ្គង" msgid "Invalid file format" msgstr "ប្រតិបត្តិការមិនត្រឹមត្រូវ %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មានកូនសោសាធារណៈអាចរកបានក្នុងកូនសោ IDs ខាងក្រោមនេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2189,12 +2239,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2203,12 +2253,12 @@ msgstr "" "ខ្ញុំមិនអាចរកទីតាំងឯកសារសម្រាប់កញ្ចប់ %s បានទេ ។ មានន័យថាអ្នកត្រូវការជួសជុលកញ្ចប់នេះដោយដៃ ។ " "(ដោយសារបាត់ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2279,19 +2329,19 @@ msgstr "មិនបានយល់ពីប្រភេទម្ msgid "No priority (or zero) specified for pin" msgstr "គ្មានអទិភាព (ឬ សូន្យ) បានបញ្ជាក់សម្រាប់ម្ជុលទេ" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "មិនអាចបើកឯកសារ %s បានឡើយ" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2686,44 +2736,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2857,40 +2907,40 @@ msgstr "មិនអាចបើកឯកសារ %s បានឡ msgid "Could not open file descriptor %d" msgstr "មិនអាចបើកបំពុងសម្រាប់ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "បរាជ័យក្នុងការបង្កើតដំណើរការរង IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "បរាជ័យក្នុងការប្រតិបត្តិកម្មវិធីបង្ហាប់ " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "អាន, នៅតែមាន %lu ដើម្បីអាន ប៉ុន្តែគ្មានអ្វីនៅសល់" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ, នៅតែមាន %lu ដើម្បីសរសេរ ប៉ុន្តែមិនអាច" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មានបញ្ហាក្នុងការបិទឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហាក្នុងការធ្វើសមកាលកម្មឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហាក្នុងការផ្ដាច់តំណឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "មានបញ្ហាក្នុងការធ្វើសមកាលកម្មឯកសារ" @@ -3116,31 +3166,31 @@ msgstr "មិនអាចថ្លែង %s បានឡើយ" msgid "Cannot get debconf version. Is debconf installed?" msgstr "មិនអាចទទួលយកកំណែ debconf ។ តើ debconf បានដំឡើងឬ ?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "បញ្ជីផ្នែកបន្ថែមកញ្ចប់វែងពេក" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "កំហុសដំណើរការថត %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "បញ្ជីផ្នែកបន្ថែមប្រភពវែងពេក" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "កំហុសសរសេរបឋមកថាទៅឯកសារមាតិកា" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "កំហុសដំណើរការមាតិកា %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3221,26 +3271,26 @@ msgstr "" " -c=? អានឯកសារការកំណត់រចនាសម្ព័ន្ធនេះ\n" " -o=? កំណត់ជម្រើសការកំណត់រចនាសម្ព័ន្ធតាមចិត្ត" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "គ្មានការជ្រើសដែលផ្គួផ្គង" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ឯកសារមួយចំនួនបាត់បងពីក្រុមឯកសារកញ្ចប់ `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB បានខូច, ឯកសារបានប្តូរឈ្មោះទៅជា %s.old ។" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់, កំពុងព្យាយាមធ្វើឲ្យ %s ប្រសើរឡើង" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3249,16 +3299,21 @@ msgstr "" "ទ្រង់ទ្រាយមូលដ្ឋានទិន្នន័យមិនត្រឹមត្រូវ ។ ប្រសិនបើអ្នកបានធ្វើឲ្យវាប្រសើឡើងពីកំណែចាស់របស់ apt សូមយក" "មូលដ្ឋានទិន្នន័យចេញ និងបង្កើតមូលដ្ឋានទិន្នន័យឡើងវិញ ។" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "មិនអាចបើកឯកសារ DB បានទេ %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "បានបរាជ័យក្នុងការអានតំណ %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "ប័ណ្ណសារគ្មានកំណត់ត្រាត្រួតពិនិត្យទេ" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "មិនអាចយកទស្សន៍ទ្រនិច" @@ -3323,31 +3378,31 @@ msgstr "*** បានបរាជ័យក្នុងការត msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់នៃការវាយ %sB ។\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "ប័ណ្ណសារគ្មានវាលកញ្ចប់" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មានធាតុធាតុបញ្ចូលបដិសេធឡើយ\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នកថែទាំ %s គឺ %s មិនមែន %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មានធាតុបដិសេធប្រភព\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មានធាតុបដិសេធគោលពីរដែរ\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - បរាជ័យក្នុងការបម្រុងទុកសតិ" @@ -3423,7 +3478,7 @@ msgstr "បានបរាជ័យក្នុងការអាន msgid "Problem unlinking %s" msgstr "មានបញ្ហាក្នុងការផ្ដាច់តំណ %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3521,38 +3576,9 @@ msgstr "" #~ msgstr "កញ្ចប់ %s មិនមានការដំឡើងសាកល្បងឡើយ" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "មិនទាន់បានដំឡើងកញ្ចប់ %s ទេ ដូច្នេះ មិនបានយកចេញឡើយ \n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "មិនទាន់បានដំឡើងកញ្ចប់ %s ទេ ដូច្នេះ មិនបានយកចេញឡើយ \n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "ចំណាំ កំពុងជ្រើស %s ជំនួស %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "កំពុងរំលង %s វាបានដំឡើងរួចរាល់ ហើយភាពធ្វើឲ្យប្រសើរមិនទាន់កំណត់ ។\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "កំពុងរំលង %s វាបានដំឡើងរួចរាល់ ហើយភាពធ្វើឲ្យប្រសើរមិនទាន់កំណត់ ។\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វាមិនអាចត្រូវបានទាញយកបានឡើយ ។\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ជាកំណែដែលថ្មីបំផុតរួចទៅហើយ ។\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "បានជ្រើសកំណែ %s (%s) សម្រាប់ %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "បានជ្រើសកំណែ %s (%s) សម្រាប់ %s\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "នេះជាប័ណ្ណសារ DEB មិនត្រឹមត្រូវ វាគ្មានសមាជិក '%s' ឬ '%s'" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -153,9 +153,9 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -323,6 +323,7 @@ msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" @@ -350,12 +351,12 @@ msgstr "다운로드 디렉터리를 잠글 수 없습니다" msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -364,7 +365,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -375,95 +376,95 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -472,7 +473,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -481,14 +482,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -497,7 +498,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -506,30 +507,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -622,11 +623,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -830,9 +831,9 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "읽기 오류" @@ -845,9 +846,9 @@ msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "쓰기 오류" @@ -1159,108 +1160,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [설치함]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1268,27 +1269,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1297,7 +1298,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1305,21 +1306,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1328,6 +1329,13 @@ msgstr "정규식 컴파일 오류 - %s" msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1390,7 +1398,7 @@ msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" @@ -1487,7 +1495,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:" @@ -1529,7 +1537,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1540,22 +1548,64 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "망가진 패키지" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "추천하는 패키지:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s 패키지는 이미 최신 버전입니다.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1568,23 +1618,23 @@ msgstr "" " 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n" " 않도록 하십시오!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 패키지를 인증할 수 없습니다!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 패키지가 있습니다" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "확인하지 않고 패키지를 설치하시겠습니까?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" @@ -1782,7 +1832,7 @@ msgid "The diversion path is too long" msgstr "전환하는 경로가 너무 깁니다" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는데 실패했습니다" @@ -2127,27 +2177,27 @@ msgstr "%s에 쓸 수 없습니다" msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." @@ -2165,35 +2215,35 @@ msgstr "크기가 맞지 않습니다" msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2203,12 +2253,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2217,12 +2267,12 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2295,7 +2345,7 @@ msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2304,12 +2354,12 @@ msgstr "" "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에" "서 APT::Immediate-Configure 항목을 보십시오. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2708,20 +2758,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2729,20 +2779,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2750,7 +2800,7 @@ msgid "" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2888,40 +2938,40 @@ msgstr "%s 파일을 열 수 없습니다" msgid "Could not open file descriptor %d" msgstr "%d 파일 디스크립터를 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는데 실패했습니다" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -3147,31 +3197,31 @@ msgstr "%s의 정보를 읽을 수 없습니다" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "패키지 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3252,26 +3302,26 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "맞는 패키지가 없습니다" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3279,17 +3329,22 @@ msgstr "" "DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 " "지우고 다시 만드십시오." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s 파일에 readlink하는데 실패했습니다" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" @@ -3355,31 +3410,31 @@ msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는데 실패했습니다" @@ -3455,7 +3510,7 @@ msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3566,38 +3621,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "'%s' 패키지와 같은 가상 패키지는 제거할 수 없습니다\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "주의, '%2$s' 대신에 '%1$s' 패키지를 선택합니다\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s 패키지는 이미 최신 버전입니다.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "'%2$s' 패키지의 '%1$s' 대상 릴리스는 없으므로 무시합니다." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -161,9 +161,9 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -295,6 +295,7 @@ msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" @@ -322,19 +323,19 @@ msgstr "Pelrêça daxistinê nayê quflekirin" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -342,151 +343,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -536,11 +537,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -741,9 +742,9 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Çewiya xwendinê" @@ -756,9 +757,9 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -1071,134 +1072,134 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " û" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1207,7 +1208,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1216,21 +1217,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1239,6 +1240,14 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1300,7 +1309,7 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -1386,7 +1395,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "" @@ -1428,7 +1437,7 @@ msgid "" "solution)." msgstr "" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1436,22 +1445,63 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Paketên şikestî" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s jixwe guhertoya nûtirîn e.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1460,23 +1510,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -1672,7 +1722,7 @@ msgid "The diversion path is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "" @@ -2016,27 +2066,27 @@ msgstr "Nivîsandin ji bo %s ne pêkane" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nav guherandin biserneket, %s (%s -> %s)" @@ -2053,35 +2103,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2089,24 +2139,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2175,19 +2225,19 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nikarî pelê %s veke" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2575,44 +2625,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2746,40 +2796,40 @@ msgstr "Nikarî pelê %s veke" msgid "Could not open file descriptor %d" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "" @@ -2995,31 +3045,31 @@ msgstr "Nivîsandin ji bo %s ne pêkane" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Di şixulandina pêrista %s de çewtî" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Dema şixulandina naveroka %s çewtî" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3061,41 +3111,46 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Danegira %s nehate vekirin: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Rakirina %s biserneket" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Tomara kontrola arşîvê tuneye" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "" @@ -3160,31 +3215,31 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "" @@ -3260,7 +3315,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3312,15 +3367,9 @@ msgstr "" #~ msgid " [Not candidate version]" #~ msgstr "Guhartoyên berendam" -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s jixwe guhertoya nûtirîn e.\n" - #~ msgid "MD5Sum mismatch" #~ msgstr "MD5Sum li hev nayên" -#~ msgid "Failed to remove %s" -#~ msgstr "Rakirina %s biserneket" - #~ msgid "Unable to create %s" #~ msgstr "Nikare %s biafirîne" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -159,9 +159,9 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -292,6 +292,7 @@ msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" @@ -319,19 +320,19 @@ msgstr "Nepavyko užrakinti parsiuntimų aplanko" msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -339,95 +340,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -435,7 +436,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -443,14 +444,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -459,7 +460,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -467,30 +468,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -541,11 +542,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -745,9 +746,9 @@ msgstr "Jungiamasi per ilgai" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Skaitymo klaida" @@ -760,9 +761,9 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Rašymo klaida" @@ -1074,108 +1075,108 @@ msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaida msgid "Unmet dependencies. Try using -f." msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1183,27 +1184,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1212,7 +1213,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[T/n]" @@ -1220,21 +1221,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1243,6 +1244,14 @@ msgstr "" msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1304,7 +1313,7 @@ msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" @@ -1395,7 +1404,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" @@ -1440,7 +1449,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1452,22 +1461,65 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Sugadinti paketai" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ir taip jau yra naujausias.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Pažymėta versija %s (%s) paketui %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Pažymėta versija %s (%s) paketui %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1476,23 +1528,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Nepavyko autentikuoti kai kurių paketų" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Įdiegti šiuos paketus be patvirtinimo?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -1695,7 +1747,7 @@ msgid "The diversion path is too long" msgstr "" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nepavyko patikrinti %s" @@ -2040,27 +2092,27 @@ msgstr "Nepavyko įrašyti į %s" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" @@ -2078,35 +2130,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2114,24 +2166,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2203,19 +2255,19 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nepavyko atverti failo %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2603,44 +2655,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2774,40 +2826,40 @@ msgstr "Nepavyko atverti failo %s" msgid "Could not open file descriptor %d" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nepavyko sukurti subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nepavyko paleisti suspaudėjo " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -3034,31 +3086,31 @@ msgstr "Nepavyko sukurti %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Paketo plėtinių sąrašas yra per ilgas" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Klaida apdorojant aplanką %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Šaltinio plėtinys yra per ilgas" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Klaida įrašant antraštę į turinio failą" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Klaida apdorojant turinį %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3144,26 +3196,26 @@ msgstr "" " -c=? Perskaityti šį nuostatų failą\n" " -o=? Nustatyti savarankišką konfigūracijos nuostatą" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nėra atitikmenų" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Kai kurių failų nėra paketų grupėje „%s“" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3172,16 +3224,21 @@ msgstr "" "Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " "versijos, prašome pašalinkite ir perkurkite duomenų bazę." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nepavyko nuskaityti nuorodos %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "" @@ -3246,31 +3303,31 @@ msgstr "*** Nepavyko susieti %s su %s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nepavyko išskirti atminties" @@ -3346,7 +3403,7 @@ msgstr "Skaitymo klaida skaičiuojant MD5" msgid "Problem unlinking %s" msgstr "" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3439,42 +3496,9 @@ msgstr "" #~ msgstr "Paketas %s neturi diegimo kandidatų" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Pastaba: pažymimas %s vietoje %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra " -#~ "nurodytas.\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra " -#~ "nurodytas.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ir taip jau yra naujausias.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Pažymėta versija %s (%s) paketui %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Pažymėta versija %s (%s) paketui %s\n" - #~ msgid "MD5Sum mismatch" #~ msgstr "MD5 sumos neatitikimas" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -156,9 +156,9 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -326,6 +326,7 @@ msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" @@ -353,19 +354,19 @@ msgstr "डाऊनलोड डिरेक्टरी कुलूपबं msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -373,114 +374,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -489,37 +490,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -611,11 +612,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -819,9 +820,9 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "त्रुटी वाचा" @@ -834,9 +835,9 @@ msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1149,108 +1150,108 @@ msgstr "हे बरोबर करण्यासाठी तुम्हा msgid "Unmet dependencies. Try using -f." msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा " -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1258,27 +1259,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1287,7 +1288,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1295,21 +1296,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1318,6 +1319,14 @@ msgstr "रिजेक्स कंपायलेशन त्रुटी -%s msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1379,7 +1388,7 @@ msgstr "या क्रियेनंतर, %sB डिस्क जागा msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" @@ -1474,7 +1483,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" @@ -1521,7 +1530,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1533,22 +1542,63 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1557,24 +1607,24 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 #, fuzzy msgid "Install these packages without verification?" msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -1774,7 +1824,7 @@ msgid "The diversion path is too long" msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s स्टेट करण्यास असमर्थ" @@ -2123,27 +2173,27 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ " msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." @@ -2161,35 +2211,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2197,12 +2247,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2211,12 +2261,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2290,19 +2340,19 @@ msgstr "%s पिनचा प्रकार समजलेला नाही msgid "No priority (or zero) specified for pin" msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2698,44 +2748,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2869,40 +2919,40 @@ msgstr "%s फाईल उघडता येत नाही" msgid "Could not open file descriptor %d" msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -3127,31 +3177,31 @@ msgstr "%s स्टॅट करण्यास असमर्थ" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "त्रुटी प्रक्रिया मजकूर %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3232,26 +3282,26 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "निवडक भाग जुळत नाही" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3260,16 +3310,21 @@ msgstr "" "DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " "कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s वाचणारा दुवा असमर्थ" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "संकेतक घेण्यास असमर्थ" @@ -3334,31 +3389,31 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ" msgid " DeLink limit of %sB hit.\n" msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" @@ -3434,7 +3489,7 @@ msgstr "MD5 कामप्युटींग करतांना वाचण msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3533,40 +3588,9 @@ msgstr "" #~ msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "हा वैध DEB अर्काईव्ह नाही, ह्याला '%s', '%s' किंवा '%s' मेंबर नाही" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -161,9 +161,9 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -332,6 +332,7 @@ msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" @@ -359,12 +360,12 @@ msgstr "Klarer ikke å låse nedlastingsmappa" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -373,7 +374,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -384,116 +385,116 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, 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:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,37 +503,37 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -626,11 +627,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -836,9 +837,9 @@ msgstr "Tidsavbrudd på forbindelsen" msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Lesefeil" @@ -851,9 +852,9 @@ msgid "Protocol corruption" msgstr "Protokollødeleggelse" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Skrivefeil" @@ -1167,108 +1168,108 @@ msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1276,27 +1277,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1305,7 +1306,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1313,21 +1314,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1336,6 +1337,14 @@ msgstr "Kompileringsfeil i regulært uttrykk - %s" msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1399,7 +1408,7 @@ msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" @@ -1497,7 +1506,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" @@ -1543,7 +1552,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1555,22 +1564,66 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Ødelagte pakker" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Anbefalte pakker" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Hopper over %s siden den ikke er installert eller kun oppgraderinger er " +"ønsket.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s er allerede nyeste versjon.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1583,23 +1636,23 @@ msgstr "" " Husk også at låsing er deaktivert, så ikke regn med \n" " relevans i forhold til den reelle gjeldende situasjonen." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsadvarsel overstyrt.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Installer disse pakkene uten verifikasjon?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -1799,7 +1852,7 @@ msgid "The diversion path is too long" msgstr "Avledningsstien er for lang" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke å få statusen på %s" @@ -2144,27 +2197,27 @@ msgstr "Kan ikke skrive til %s" msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." @@ -2182,36 +2235,36 @@ msgstr "Feil størrelse" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2221,12 +2274,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2235,12 +2288,12 @@ 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2313,7 +2366,7 @@ msgstr "Forsto ikke spikring av typen %s" msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2322,12 +2375,12 @@ msgstr "" "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf " "under APT::Immediate-Configure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2732,20 +2785,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2753,7 +2806,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2761,7 +2814,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2769,7 +2822,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2778,7 +2831,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2914,40 +2967,40 @@ msgstr "Klarte ikke åpne fila %s" msgid "Could not open file descriptor %d" msgstr "Klarte ikke åpne fildeskriptor %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke å opprette underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Klarte ikke å kjøre komprimeringen" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved endring av navn på fila %s til %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -3177,31 +3230,31 @@ msgstr "Klarte ikke å få statusen på %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3283,26 +3336,26 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkårlig innstilling" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Ingen utvalg passet" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsøker å oppgradere %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3310,16 +3363,21 @@ msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " "fjern og så gjenopprett databasen." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke å åpne Databasefila %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Klarte ikke å lese lenken %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Klarte ikke å finne en peker" @@ -3384,31 +3442,31 @@ msgstr "*** Klarte ikke å lenke %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %s B er nådd.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppføring\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binæroverstyringsoppføring heller\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke å tildele minne" @@ -3484,7 +3542,7 @@ msgstr "Klarte ikke å lese under utregning av MD5" msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3595,40 +3653,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Merk, velger «%s» istedenfor «%s»\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Hopper over %s siden den ikke er installert eller kun oppgraderinger er " -#~ "ønsket.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s er allerede nyeste versjon.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -159,9 +159,9 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -330,6 +330,7 @@ msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" @@ -357,19 +358,19 @@ msgstr "डाउनलोड डाइरेक्ट्री ताल्च msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -377,114 +378,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -493,37 +494,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -613,11 +614,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -821,9 +822,9 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -836,9 +837,9 @@ msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1150,108 +1151,108 @@ msgstr "यी सुधार गर्न तपाईँले 'apt-get -f in msgid "Unmet dependencies. Try using -f." msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1259,27 +1260,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1288,7 +1289,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1296,21 +1297,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1319,6 +1320,14 @@ msgstr "संकलन त्रुटि रिजेक्स गर्नु msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1380,7 +1389,7 @@ msgstr "%sB अनप्याक गरिसके पछि डिस्क msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" @@ -1472,7 +1481,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " @@ -1517,7 +1526,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1530,22 +1539,63 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1554,24 +1604,24 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! " -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 #, fuzzy msgid "Install these packages without verification?" msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -1772,7 +1822,7 @@ msgid "The diversion path is too long" msgstr "घुम्ती बाटो अति लामो छ" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr " %s स्थिर गर्न असफल" @@ -2117,27 +2167,27 @@ msgstr " %s मा लेख्न असक्षम" msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" @@ -2156,35 +2206,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2192,12 +2242,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2206,12 +2256,12 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2283,19 +2333,19 @@ msgstr "पिन टाइप %s बुझ्न सकिएन " msgid "No priority (or zero) specified for pin" msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2690,44 +2740,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2861,40 +2911,40 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "Could not open file descriptor %d" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -3120,31 +3170,31 @@ msgstr "%s स्थिर गर्न असक्षम भयो" msgid "Cannot get debconf version. Is debconf installed?" msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "प्याकेज विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "स्रोत विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3227,41 +3277,46 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "कुनै चयनहरू मेल खाएन" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB फाइल %s असक्षम भयो: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "लिङ्क पढ्न असफल %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" @@ -3326,31 +3381,31 @@ msgstr "*** %s मा %s लिङ्क असफल भयो" msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" @@ -3426,7 +3481,7 @@ msgstr "MD5 गणना गर्दा पढ्न असफल भयो" msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3524,38 +3579,9 @@ msgstr "" #~ msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "यो वैध DEB संग्रह होइन, यो संग '%s' वा '%s' सदस्य छैन" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -159,9 +159,9 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -332,6 +332,7 @@ msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" @@ -361,12 +362,12 @@ msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -376,7 +377,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -388,97 +389,97 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +488,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +497,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +513,7 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +522,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -640,11 +641,11 @@ msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -849,9 +850,9 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Leesfout" @@ -864,9 +865,9 @@ msgid "Protocol corruption" msgstr "Protocolcorruptie" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Schrijffout" @@ -1186,108 +1187,108 @@ msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " of" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1295,27 +1296,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1324,7 +1325,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1332,21 +1333,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1355,6 +1356,14 @@ msgstr "Regex-compilatiefout - %s" msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1418,7 +1427,7 @@ msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" @@ -1515,7 +1524,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" @@ -1565,7 +1574,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)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1576,22 +1585,68 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " +"gevraagd.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is " +"gevraagd.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s is reeds de nieuwste versie.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1604,24 +1659,24 @@ msgstr "" " Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n" " vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Authentificatiewaarschuwing is genegeerd.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Wilt u deze pakketten installeren zonder verificatie?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" @@ -1825,7 +1880,7 @@ msgid "The diversion path is too long" msgstr "Het omleidingspad is te lang" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "stat op %s is mislukt" @@ -2180,27 +2235,27 @@ msgstr "Kan niet naar %s schrijven" msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "herbenoeming is mislukt, %s (%s -> %s)." @@ -2218,36 +2273,36 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2258,12 +2313,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2272,12 +2327,12 @@ 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2354,7 +2409,7 @@ msgstr "Pintype %s wordt niet begrepen" msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2363,12 +2418,12 @@ msgstr "" "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2778,22 +2833,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2801,7 +2856,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2809,7 +2864,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2817,7 +2872,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2826,7 +2881,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2968,40 +3023,40 @@ msgstr "Kon het bestand %s niet openen" msgid "Could not open file descriptor %d" msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -3236,31 +3291,31 @@ msgstr "Kan de status van %s niet opvragen" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Fout bij het verwerken van map %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3344,26 +3399,26 @@ msgstr "" " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Geen van de selecties kwam overeen" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3371,16 +3426,21 @@ msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van " "apt, dient u de database te verwijderen en opnieuw aan te maken." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink op %s is mislukt" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" @@ -3445,31 +3505,31 @@ msgstr "*** Linken van %s aan %s is mislukt" msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB bereikt.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" @@ -3545,7 +3605,7 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3656,42 +3716,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuele pakketten zoals '%s' kunnen niet worden verwijderd\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " -#~ "gevraagd.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering " -#~ "is gevraagd.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s is reeds de nieuwste versie.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -161,9 +161,9 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -334,6 +334,7 @@ msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" @@ -362,19 +363,19 @@ msgstr "Klarte ikkje lsa nedlastingskatalogen" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -382,115 +383,115 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, 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:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, 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:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -499,37 +500,37 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -620,11 +621,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -830,9 +831,9 @@ msgstr "Tidsavbrot p samband" msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Lesefeil" @@ -845,9 +846,9 @@ msgid "Protocol corruption" msgstr "Protokollydeleggjing" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Skrivefeil" @@ -1160,108 +1161,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1270,27 +1271,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1299,7 +1300,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1307,21 +1308,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1330,6 +1331,14 @@ msgstr "Regex-kompileringsfeil - %s" msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1392,7 +1401,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" @@ -1484,7 +1493,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" @@ -1530,7 +1539,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1542,22 +1551,67 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "ydelagde pakkar" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Tilrdde pakkar" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Hoppar over %s, for den er installert fr fr og ikkje sett til " +"oppgradering.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Den nyaste versjonen av %s er installert fr fr.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Vald versjon %s (%s) for %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Vald versjon %s (%s) for %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1566,23 +1620,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Installer desse pakkane utan verifikasjon?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -1781,7 +1835,7 @@ msgid "The diversion path is too long" msgstr "Avleiingsstigen er for lang" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" @@ -2130,27 +2184,27 @@ msgstr "Klarte ikkje skriva til %s" msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." @@ -2169,35 +2223,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2205,12 +2259,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2219,12 +2273,12 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2297,19 +2351,19 @@ msgstr "Skjnar ikkje spikringstypen %s" msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2705,44 +2759,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2876,40 +2930,40 @@ msgstr "Klarte ikkje opna fila %s" msgid "Could not open file descriptor %d" msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Klarte ikkje kyra komprimeringa " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -3135,31 +3189,31 @@ msgstr "Klarte ikkje f status til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -3239,41 +3293,46 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling." -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Ingen utval passa" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forskjer oppgradere %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Klarte ikkje lesa lenkja %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" @@ -3338,31 +3397,31 @@ msgstr "*** Klarte ikkje lenkja %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" @@ -3438,7 +3497,7 @@ msgstr "Klarte ikkje lesa under utrekning av MD5" msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3536,43 +3595,9 @@ msgstr "" #~ msgstr "Det finst ingen installasjonskandidat for pakken %s" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Merk, vel %s i staden for %s\n" -#~ 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" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Hoppar over %s, for den er installert fr fr og ikkje sett til " -#~ "oppgradering.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Den nyaste versjonen av %s er installert fr fr.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Vald versjon %s (%s) for %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Vald versjon %s (%s) for %s\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -163,9 +163,9 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -333,6 +333,7 @@ msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" @@ -364,12 +365,12 @@ msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -379,7 +380,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -391,80 +392,80 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -473,17 +474,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -492,7 +493,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -501,14 +502,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -517,7 +518,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -526,30 +527,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -644,11 +645,11 @@ msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -878,9 +879,9 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Błąd odczytu" @@ -893,9 +894,9 @@ msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Błąd zapisu" @@ -1212,108 +1213,108 @@ msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." msgid "Unmet dependencies. Try using -f." msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1321,27 +1322,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1350,7 +1351,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[T/n]" @@ -1358,21 +1359,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1381,6 +1382,15 @@ msgstr "Błąd kompilacji wyrażenia regularnego - %s" msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1445,7 +1455,7 @@ msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" @@ -1546,7 +1556,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" @@ -1605,7 +1615,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1617,22 +1627,68 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Polecane pakiety:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s jest już w najnowszej wersji.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy chodziło o " +"\"%s\"?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1645,23 +1701,23 @@ msgstr "" " Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n" " na związku z rzeczywistą sytuacją!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Zainstalować te pakiety bez weryfikacji?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -1866,7 +1922,7 @@ msgid "The diversion path is too long" msgstr "Zbyt długa ścieżka ominięcia" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" @@ -2210,29 +2266,29 @@ msgstr "Nie udało się pisać do %s" msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Przygotowywanie na otrzymanie rozwiązania" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" "Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania " "prawidłowego komunikatu o błędzie" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" @@ -2250,7 +2306,7 @@ msgstr "Błędny rozmiar" msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2259,16 +2315,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2277,12 +2333,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2292,12 +2348,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2306,12 +2362,12 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2385,7 +2441,7 @@ msgstr "Nierozpoznany typ przypinania %s" msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypięcia" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2395,12 +2451,12 @@ msgstr "" "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " "się więcej. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2814,20 +2870,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2835,7 +2891,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2843,7 +2899,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2851,7 +2907,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2860,7 +2916,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3007,40 +3063,40 @@ msgstr "Nie udało się otworzyć pliku %s" msgid "Could not open file descriptor %d" msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nie udało się utworzyć IPC z podprocesem" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nie udało się uruchomić kompresora " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -3271,31 +3327,31 @@ msgstr "Nie można wykonać operacji stat na %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lista rozszerzeń pakietów jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Błąd przetwarzania katalogu %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista rozszerzeń źródeł jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Błąd podczas przetwarzania zawartości %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3378,26 +3434,26 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny\n" " -o=? Ustawia dowolną opcję konfiguracji" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nie dopasowano żadnej nazwy" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\"" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzała, próbuję zaktualizować %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3405,16 +3461,21 @@ msgstr "" "Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę " "usunąć i utworzyć ponownie bazę danych." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nie udało się otworzyć pliku bazy %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nie udało się odczytać dowiązania %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nie udało się pobrać kursora" @@ -3479,31 +3540,31 @@ msgstr "*** Nie udało się dowiązać %s do %s" msgid " DeLink limit of %sB hit.\n" msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nie udało się zaalokować pamięci" @@ -3579,7 +3640,7 @@ msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3689,40 +3750,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Pakiety wirtualne, takie jak \"%s\" nie mogą być usunięte\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy " -#~ "chodziło o \"%s\"?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Pomijanie %s, jest już zainstalowane, a nie została wybrana " -#~ "aktualizacja.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać " -#~ "pobrany.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s jest już w najnowszej wersji.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorowanie niedostępnego wydania docelowego %s pakietu %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -159,9 +159,9 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -328,6 +328,7 @@ msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" @@ -357,12 +358,12 @@ msgstr "Impossível criar acesso exclusivo ao directório de downloads" msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -372,7 +373,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -383,81 +384,81 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,18 +467,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +487,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +496,14 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +512,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +521,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -638,11 +639,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -867,9 +868,9 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Erro de leitura" @@ -882,9 +883,9 @@ msgid "Protocol corruption" msgstr "Corrupção de protocolo" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Erro de escrita" @@ -1201,108 +1202,108 @@ msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1310,27 +1311,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1339,7 +1340,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1347,21 +1348,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1370,6 +1371,14 @@ msgstr "Erro de compilação de regex - %s" msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1433,7 +1442,7 @@ msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e foi utilizado -y sem --force-yes" @@ -1530,7 +1539,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" @@ -1577,7 +1586,7 @@ msgstr "" "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1589,22 +1598,67 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pacotes estragados" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Pacotes recomendados:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s já está na versão mais recente.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versão seleccionada '%s' (%s) para '%s'\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"O pacote '%s' não está instalado, por isso não será removido. Queria dizer " +"'%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "O pacote '%s' não está instalado, por isso não será removido\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1617,23 +1671,23 @@ msgstr "" "\tTenha em mente que o acesso exclusivo está desabilitado,\n" "\tpor isso não confie na relevância da real situação actual!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Instalar estes pacotes sem verificação?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -1836,7 +1890,7 @@ msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Falha stat %s" @@ -2191,27 +2245,27 @@ msgstr "Não conseguiu escrever para %s" msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Enviar cenário a resolver" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Enviar pedido para resolvedor" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Preparar para receber solução" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Executar resolvedor externo" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." @@ -2229,7 +2283,7 @@ msgstr "Tamanho incorrecto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2238,18 +2292,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2258,12 +2312,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2274,12 +2328,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2289,12 +2343,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2369,7 +2423,7 @@ msgstr "Não foi possível entender o tipo de marca (pin) %s" msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2378,12 +2432,12 @@ msgstr "" "Não foi possível proceder à configuração imediata em '%s'. Para detalhes, " "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Não pode configurar '%s'. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2797,20 +2851,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2818,7 +2872,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2826,7 +2880,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2834,7 +2888,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2843,7 +2897,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2993,40 +3047,40 @@ msgstr "Não foi possível abrir ficheiro o %s" msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Falhou criar subprocesso IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Falhou executar compactador " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -3259,31 +3313,31 @@ msgstr "Não foi possível fazer stat %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não pode obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "A lista de extensão de pacotes é demasiado longa" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Erro ao processar o directório %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista de extensão de códigos-fonte é demasiado longa" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Erro ao processar o conteúdo %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3364,26 +3418,26 @@ msgstr "" " -c=? Ler este ficheiro de configuração\n" " -o=? Definir uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de dados é antiga, a tentar actualizar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3391,16 +3445,21 @@ msgstr "" "O formato da BD é inválido. Se actualizou a partir de uma versão antiga do " "apt, por favor remova-a e crie novamente a base de dados." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Falhou o readlink %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "O arquivo não tem registo de controlo" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" @@ -3465,31 +3524,31 @@ msgstr "*** Falhou ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Falhou alocar memória" @@ -3565,7 +3624,7 @@ msgstr "Falhou ler durante o cálculo de MD5" msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3675,38 +3734,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Pacotes virtuais como '%s' não podem ser removidos\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "O pacote '%s' não está instalado, por isso não será removido. Queria " -#~ "dizer '%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "O pacote '%s' não está instalado, por isso não será removido\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Note, a seleccionar '%s' em vez de '%s'\n" -#~ 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" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s já está na versão mais recente.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versão seleccionada '%s' (%s) para '%s'\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "Ignorar o lançamento pretendido, não disponível, '%s' do pacote '%s'" diff --git a/po/pt_BR.po b/po/pt_BR.po index 21355434e..8e6fc88d5 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: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -159,9 +159,9 @@ msgid " Version table:" msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -334,6 +334,7 @@ msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" @@ -361,19 +362,19 @@ msgstr "Impossível criar trava no diretório de download" msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -381,97 +382,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -480,7 +481,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -489,14 +490,14 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +506,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +515,30 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando em %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -630,11 +631,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -838,9 +839,9 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Erro de leitura" @@ -853,9 +854,9 @@ msgid "Protocol corruption" msgstr "Corrupção de protocolo" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Erro de escrita" @@ -1173,108 +1174,108 @@ msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los." msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "mas não será instalado" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1283,27 +1284,27 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1312,7 +1313,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[S/n]" @@ -1320,21 +1321,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1343,6 +1344,14 @@ msgstr "Erro de compilação de regex - %s" msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1407,7 +1416,7 @@ msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" @@ -1500,7 +1509,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" @@ -1553,7 +1562,7 @@ msgstr "" "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1565,22 +1574,63 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram retirados da \"Incoming\"." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pacotes quebrados" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Pacotes recomendados:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s já é a versão mais nova.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versão selecionada %s (%s) para %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versão selecionada %s (%s) para %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "O pacote %s não está instalado, então não será removido\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, 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" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1589,23 +1639,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação sobreposto.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Instalar estes pacotes sem verificação?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" @@ -1810,7 +1860,7 @@ msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Falhou ao executar \"stat\" %s" @@ -2165,27 +2215,27 @@ msgstr "Impossível escrever para %s" msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar cache fonte" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." @@ -2203,35 +2253,35 @@ msgstr "Tamanho incorreto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2239,12 +2289,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2254,12 +2304,12 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2333,19 +2383,19 @@ msgstr "Não foi possível entender o tipo de \"pin\" %s" msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2748,44 +2798,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2919,40 +2969,40 @@ msgstr "Não foi possível abrir arquivo %s" msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir \"pipe\" para %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Falhou ao criar sub-processo IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Falhou ao executar compactador " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -3181,31 +3231,31 @@ msgstr "Impossível executar \"stat\" em %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é muito extensa" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o diretório %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é muito extensa" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Erro processando conteúdo %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3287,26 +3337,26 @@ msgstr "" " -c=? Lê o arquivo de configuração especificado.\n" " -o=? Define uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nenhuma seleção combinou" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD estava corrompido, arquivo renomeado para %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3315,16 +3365,21 @@ msgstr "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " "apt, por favor, remova e recrie o banco de dados." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossível abrir o arquivo BD %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Falhou ao executar \"readlink\" %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" @@ -3389,31 +3444,31 @@ msgstr "*** Falhou ao ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada override binária\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" @@ -3489,7 +3544,7 @@ msgstr "Falhou ao ler durante o cálculo MD5" msgid "Problem unlinking %s" msgstr "Problema removendo %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3589,40 +3644,9 @@ msgstr "" #~ msgstr "O pacote %s não tem candidato para instalação" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "O pacote %s não está instalado, então não será removido\n" - -#, fuzzy -#~ 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" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Nota, selecionando %s ao invés de %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Pulando %s, já está instalado e a atualização não está configurada.\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Pulando %s, já está instalado e a atualização não está configurada.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s já é a versão mais nova.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versão selecionada %s (%s) para %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versão selecionada %s (%s) para %s\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" #~ "Este não é um arquivo DEB válido, não possui um membro '%s', '%s' ou '%s'" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -331,6 +331,7 @@ msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" @@ -359,19 +360,19 @@ msgstr "Nu s-a putut bloca directorul de descărcare" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -379,97 +380,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, 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:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +479,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:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +488,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +504,7 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +513,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, 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:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -629,11 +630,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -837,9 +838,9 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Eroare de citire" @@ -852,9 +853,9 @@ msgid "Protocol corruption" msgstr "Protocol corupt" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Eroare de scriere" @@ -1176,108 +1177,108 @@ msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." msgid "Unmet dependencies. Try using -f." msgstr "Dependențe neîndeplinite. Încercați să folosiți -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalat]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1285,27 +1286,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1314,7 +1315,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1322,21 +1323,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1345,6 +1346,15 @@ msgstr "Eroare de compilare expresie regulată - %s" msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1408,7 +1418,7 @@ msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc. msgid "You don't have enough free space in %s." msgstr "Nu aveți suficient spațiu în %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" @@ -1505,7 +1515,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" @@ -1559,7 +1569,7 @@ msgstr "" "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " "(sau oferiți o altă soluție)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1572,22 +1582,63 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pachete deteriorate" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Pachete recomandate:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s este deja la cea mai nouă versiune.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Versiune selectată %s (%s) pentru %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Versiune selectată %s (%s) pentru %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, 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" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1596,23 +1647,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Instalați aceste pachete fără verificare?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -1815,7 +1866,7 @@ msgid "The diversion path is too long" msgstr "Calea de redirectare este prea lungă" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" @@ -2172,27 +2223,27 @@ msgstr "Nu s-a putut scrie în %s" msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eșuată, %s (%s -> %s)." @@ -2210,37 +2261,37 @@ msgstr "Nepotrivire dimensiune" msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2248,12 +2299,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2262,12 +2313,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2341,19 +2392,19 @@ msgstr "Nu s-a înțeles tipul de pin %s" msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2751,44 +2802,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2922,40 +2973,40 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "Could not open file descriptor %d" msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Eșec la crearea IPC-ului pentru subproces" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Eșec la executarea compresorului" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -3183,31 +3234,31 @@ msgstr "Nu se poate executa „stat” pe %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Lista de extensii pentru pachet este prea lungă" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Lista de extensii pentru sursă este prea lungă" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Eroare la scrierea antetului în fișierul index" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conținutului %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3295,26 +3346,26 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nu s-a potrivit nici o selecție" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3323,16 +3374,21 @@ msgstr "" "Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " "veche, ștergeți și recreați baza de date." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nu s-a putut deschide fișierul DB %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Eșec la „readlink” pentru %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nu s-a putut obține un cursor" @@ -3397,31 +3453,31 @@ msgstr "*** Eșec la „link” între %s și %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Eșec la alocarea memoriei" @@ -3497,7 +3553,7 @@ msgstr "Eșec la citire în timpul calculului sumei MD5" msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3596,38 +3652,9 @@ msgstr "" #~ msgstr "Pachetul %s nu are nici un candidat la instalare" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Notă, se selectează %s în locul lui %s\n" -#~ 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" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s este deja la cea mai nouă versiune.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Versiune selectată %s (%s) pentru %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Versiune selectată %s (%s) pentru %s\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" #~ "Aceasta nu este o arhivă DEB validă, nu are unul din următorii membri " @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -164,9 +164,9 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -331,6 +331,7 @@ msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" @@ -361,12 +362,12 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -375,7 +376,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -386,80 +387,80 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -468,17 +469,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +488,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +497,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +513,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +522,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -642,11 +643,11 @@ msgid "Must specify at least one pair url/filename" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -875,9 +876,9 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Ошибка чтения" @@ -890,9 +891,9 @@ msgid "Protocol corruption" msgstr "Искажение протокола" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Ошибка записи" @@ -1212,109 +1213,109 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Установлен]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " или" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1322,27 +1323,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1351,7 +1352,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Д/н]" @@ -1359,21 +1360,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "н" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1382,6 +1383,15 @@ msgstr "Ошибка компиляции регулярного выражен msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1450,7 +1460,7 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а параметр -y указан без --force-yes" @@ -1552,7 +1562,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" @@ -1602,7 +1612,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1613,22 +1623,66 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Сломанные пакеты" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Пропускается %s — пакет не установлен, а запрошено только обновление.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Переустановка %s невозможна, он не скачивается.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Уже установлена самая новая версия %s.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Выбрана версия «%s» (%s) для «%s»\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в " +"виду «%s»?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1641,23 +1695,23 @@ msgstr "" " Учтите, что блокировка не используется,\n" " поэтому нет полного соответствия с текущей реальной ситуацией!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Предупреждение об аутентификации не принято в внимание.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Установить эти пакеты без проверки?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -1858,7 +1912,7 @@ msgid "The diversion path is too long" msgstr "Путь diversion слишком длинен" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" @@ -2209,27 +2263,27 @@ msgstr "Невозможно записать в %s" msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Отправка сценария решателю" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Отправка запроса решателю" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Подготовка к приёму решения" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Запустить внешний решатель" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." @@ -2247,7 +2301,7 @@ msgstr "Не совпадает размер" msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2256,16 +2310,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2274,12 +2328,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2289,12 +2343,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2303,12 +2357,12 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2381,7 +2435,7 @@ msgstr "Неизвестный тип фиксации %s" msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2390,12 +2444,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2808,20 +2862,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2829,7 +2883,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2837,7 +2891,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2845,7 +2899,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2854,7 +2908,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3003,41 +3057,41 @@ msgstr "Не удалось открыть файл %s" msgid "Could not open file descriptor %d" msgstr "Не удалось открыть файловый дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -3268,32 +3322,32 @@ msgstr "Невозможно получить атрибуты %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Список расширений источников слишком длинен" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3379,26 +3433,26 @@ msgstr "" " -c=? Использовать указанный файл настройки\n" " -o=? Задать значение произвольному параметру настройки" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была повреждена, файл переименован в %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, попытка обновить %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3406,16 +3460,21 @@ msgstr "" "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " "и создайте базу данных заново." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Не удалось прочесть ссылку %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" @@ -3480,31 +3539,31 @@ msgstr "*** Не удалось создать ссылку %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc — не удалось выделить память" @@ -3581,7 +3640,7 @@ msgstr "Ошибка чтения во время вычисления MD5" msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3691,36 +3750,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Виртуальные пакеты, подобные «%s», не могут быть удалены\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в " -#~ "виду «%s»?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Заметьте, вместо «%2$s» выбирается «%1$s»\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Пропускается %s — пакет не установлен, а запрошено только обновление.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Переустановка %s невозможна, он не скачивается.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Уже установлена самая новая версия %s.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Выбрана версия «%s» (%s) для «%s»\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Игнорируется недоступный выпуск «%s» пакета «%s»" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -327,6 +327,7 @@ msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je označený ako manuálne nainštalovaný.\n" @@ -356,12 +357,12 @@ msgstr "Adresár pre sťahovanie sa nedá zamknúť" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, 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:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -371,7 +372,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -383,80 +384,80 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, 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:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, 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:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +466,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti na zostavenie %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,20 +485,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -506,7 +507,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +515,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -630,11 +631,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -858,9 +859,9 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Chyba pri čítaní" @@ -873,9 +874,9 @@ msgid "Protocol corruption" msgstr "Narušenie protokolu" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Chyba pri zápise" @@ -1189,108 +1190,108 @@ msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“." msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1298,27 +1299,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1327,7 +1328,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1335,21 +1336,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1358,6 +1359,15 @@ msgstr "Chyba pri preklade regulárneho výrazu - %s" msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1422,7 +1432,7 @@ msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" @@ -1522,7 +1532,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 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:" @@ -1574,7 +1584,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo " "navrhnite riešenie)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1586,22 +1596,66 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Poškodené balíky" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Odporúčané balíky:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s je už najnovšej verzie.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli " +"„%s“?\n" + +#: apt-private/private-install.cc:937 +#, 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" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1614,23 +1668,23 @@ msgstr "" " Tiež pamätajte, že zamykanie je deaktivované, takže\n" " sa nespoliehajte na to že to bude platiť v reálnej situácii!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Nainštalovať tieto nekontrolované balíky?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -1829,7 +1883,7 @@ msgid "The diversion path is too long" msgstr "Diverzná cesta je príliš dlhá" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" @@ -2174,27 +2228,27 @@ msgstr "Do %s sa nedá zapisovať" msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Poslať scénár riešiteľovi" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Poslať požiadavku riešiteľovi" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Pripraviť sa na prijatie riešenia" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Spustiť externého riešiteľa" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." @@ -2212,7 +2266,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2221,16 +2275,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2239,12 +2293,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2254,12 +2308,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2268,12 +2322,12 @@ 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:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2346,7 +2400,7 @@ msgstr "Nezrozumiteľné pridržanie typu %s" msgid "No priority (or zero) specified for pin" msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2355,12 +2409,12 @@ msgstr "" "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v " "man 5 apt.conf pod APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Nedá sa nakonfigurovať „%s“." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2765,20 +2819,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2786,7 +2840,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2794,7 +2848,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2802,7 +2856,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2811,7 +2865,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2947,40 +3001,40 @@ msgstr "Nedá sa otvoriť súbor %s" msgid "Could not open file descriptor %d" msgstr "Nedá sa otvoriť popisovač súboru %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriť podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém pri synchronizovaní súboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -3210,31 +3264,31 @@ msgstr "Nedá sa vyhodnotiť %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Chyba pri spracovávaní adresára %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3314,26 +3368,26 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3341,16 +3395,21 @@ msgstr "" "Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " "odstrániť a znovu vytvoriť databázu." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriť DB súbor %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nie je možné vykonať readlink %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Archív nemá riadiaci záznam" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Nedá sa získať kurzor" @@ -3415,31 +3474,31 @@ msgstr "*** Nepodarilo sa zlinkovať %s s %s" msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Archív neobsahuje pole „package“" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žiadnu položku „source override“\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá žiadnu položku „binary override“\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" @@ -3515,7 +3574,7 @@ msgstr "Chyba čítania pri výpočte MD5" msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3623,37 +3682,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuálne balíky ako „%s“ nemožno odstrániť\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na " -#~ "mysli „%s“?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba " -#~ "aktualizácia.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s je už najnovšej verzie.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -158,9 +158,9 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -325,6 +325,7 @@ msgid "Couldn't find package %s" msgstr "Ni mogoče najti paketa %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je bil nastavljen na ročno nameščen.\n" @@ -355,12 +356,12 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -369,7 +370,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -380,80 +381,80 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -462,17 +463,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -480,20 +481,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -502,7 +503,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -511,30 +512,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -627,11 +628,11 @@ msgid "Must specify at least one pair url/filename" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -854,9 +855,9 @@ msgstr "Povezava je zakasnela" msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Napaka branja" @@ -869,9 +870,9 @@ msgid "Protocol corruption" msgstr "Okvara protokola" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Napaka pisanja" @@ -1186,108 +1187,108 @@ msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'." msgid "Unmet dependencies. Try using -f." msgstr "Nerešene odvisnosti. Poskusite uporabiti -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1295,27 +1296,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1324,7 +1325,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1332,21 +1333,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1355,6 +1356,16 @@ msgstr "Napaka med prevajanjem logičnega izraza - %s" msgid "The update command takes no arguments" msgstr "Ukaz update ne sprejema argumentov" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1420,7 +1431,7 @@ msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" msgid "You don't have enough free space in %s." msgstr "Na %s je premalo prostora." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" @@ -1526,7 +1537,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" @@ -1576,7 +1587,7 @@ msgstr "" "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "navedite rešitev)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1588,22 +1599,64 @@ msgstr "" ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n" " iz Prihajajočega." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameščeni:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Priporočeni paketi:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Najnovejša različica %s je že nameščena.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Izbrana različica '%s' (%s) za '%s'\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1616,23 +1669,23 @@ msgstr "" " Zaklepanje je onemogočeno, zato se ne zanašajte\n" " na pomembnost trenutnega pravega stanja!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Opozorilo overitve je bilo prepisano.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Nekaterih paketkov bi bilo mogoče overiti" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Ali želite te pakete namestiti brez preverjanja?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" @@ -1832,7 +1885,7 @@ msgid "The diversion path is too long" msgstr "Pot odklona je predloga" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Napaka med določitvijo %s" @@ -2177,27 +2230,27 @@ msgstr "Ni mogoče pisati na %s" msgid "IO Error saving source cache" msgstr "Napaka VI med shranjevanjem predpomnilnika virov" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Pošlji scenarij reševalniku" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Pošlji zahtevo reševalniku" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Priprava za rešitev prejemanja" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Izvedi zunanji reševalnik" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje je spodletelo, %s (%s -> %s)." @@ -2215,7 +2268,7 @@ msgstr "Neujemanje velikosti" msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2224,16 +2277,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2242,12 +2295,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2257,12 +2310,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2271,12 +2324,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2351,7 +2404,7 @@ msgstr "Ni mogoče razumeti vrste bucike %s" msgid "No priority (or zero) specified for pin" msgstr "Prednost bucike ni navedena ali pa je nič." -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2360,12 +2413,12 @@ msgstr "" "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " "APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2772,21 +2825,21 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2794,7 +2847,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2802,7 +2855,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2810,7 +2863,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -2818,7 +2871,7 @@ msgstr "" "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo " "na krajevnem sistemu" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2956,40 +3009,40 @@ msgstr "Ni mogoče odpreti datoteke %s" msgid "Could not open file descriptor %d" msgstr "Ni mogoče odpreti opisnika datotek %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Ni mogoče ustvariti podopravila IPD" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Ni mogoče izvesti stiskanja " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -3218,31 +3271,31 @@ msgstr "Ni mogoče določiti %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Seznam razširitev paketov je predolg" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Napaka med obdelavo mape %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Seznam razširitev virov je predolg" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Napaka med pisanjem glave v datoteko vsebine" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Napaka med obdelavo vsebine %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3322,26 +3375,26 @@ msgstr "" " -c=? prebere to nastavitveno datoteko\n" " -o=? nastavi poljubno možnost nastavitve" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "PZ je star, poskušanje nadgradnje %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3349,16 +3402,21 @@ msgstr "" "Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše " "različice apt, podatkovno zbirko odstranite in jo znova ustvarite." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoče odprti datoteke PZ %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Napaka med branjem povezave %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Ni mogoče najti kazalke" @@ -3423,31 +3481,31 @@ msgstr "*** Napaka med povezovanjem %s in %s" msgid " DeLink limit of %sB hit.\n" msgstr " Dosežena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prepisanega vnosa\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrževalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s nima izvornega vnosa prepisa\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima tudi binarnega vnosa prepisa\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka med dodeljevanjem pomnilnika" @@ -3523,7 +3581,7 @@ msgstr "Med računanjem MD5 ni mogoče brati" msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3634,34 +3692,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Navideznih paketov kot je '%s' ni mogoče odstraniti\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Izbiranje '%s' namesto '%s'\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Najnovejša različica %s je že nameščena.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Izbrana različica '%s' (%s) za '%s'\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Prezri nerazpoložljiv cilj izdaje '%s' paketa '%s'" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -158,9 +158,9 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -328,6 +328,7 @@ msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" @@ -355,12 +356,12 @@ msgstr "Kunde inte låsa hämtningskatalogen" msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -370,7 +371,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -381,95 +382,95 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -478,7 +479,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -487,14 +488,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +504,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,31 +513,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -629,11 +630,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -837,9 +838,9 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Läsfel" @@ -852,9 +853,9 @@ msgid "Protocol corruption" msgstr "Protokollet skadat" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Skrivfel" @@ -1175,108 +1176,108 @@ msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa." msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Prova med -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installerat]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1284,27 +1285,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1313,7 +1314,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[J/n]" @@ -1321,21 +1322,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1344,6 +1345,14 @@ msgstr "Fel vid kompilering av reguljärt uttryck - %s" msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1408,7 +1417,7 @@ msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" @@ -1507,7 +1516,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" @@ -1555,7 +1564,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1567,22 +1576,66 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Trasiga paket" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Rekommenderade paket:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Hoppar över %s, det är inte installerat och endast uppgraderingar har " +"begärts.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s är redan den senaste versionen.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Valde version \"%s\" (%s) för \"%s\"\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Valde version \"%s\" (%s) för \"%s\"\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Paketet %s är inte installerat, så det tas inte bort\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Paketet %s är inte installerat, så det tas inte bort\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1595,23 +1648,23 @@ msgstr "" " Tänk också på att låsningen är inaktiverad, så\n" " förlita dig inte på relevansen till den verkliga situationen!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsvarning åsidosatt.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Installera dessa paket utan verifiering?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -1818,7 +1871,7 @@ msgid "The diversion path is too long" msgstr "Omdirigeringssökvägen är för lång" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" @@ -2169,27 +2222,27 @@ msgstr "Kunde inte skriva till %s" msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." @@ -2207,35 +2260,35 @@ msgstr "Storleken stämmer inte" msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2246,12 +2299,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2260,12 +2313,12 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2338,7 +2391,7 @@ msgstr "Förstod inte nåltypen %s" msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2347,12 +2400,12 @@ msgstr "" "Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2760,20 +2813,20 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2781,7 +2834,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2789,7 +2842,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2797,7 +2850,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2806,7 +2859,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2944,40 +2997,40 @@ msgstr "Kunde inte öppna filen %s" msgid "Could not open file descriptor %d" msgstr "Kunde inte öppna filhandtag %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Misslyckades med att starta komprimerare " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -3207,31 +3260,31 @@ msgstr "Kunde inte ta status på %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Listan över filtillägg för Sources är för lång" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Fel vid skrivning av rubrik till innehållsfil" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Fel vid behandling av innehållet %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3312,26 +3365,26 @@ msgstr "" " -c=? Läs denna konfigurationsfil\n" " -o=? Ställ in en godtycklig konfigurationsflagga" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Inga val träffades" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Några filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var skadad, filen omdöpt till %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB är gammal, försöker uppgradera %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3339,16 +3392,21 @@ msgstr "" "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " "från en äldre version av apt." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunde inte öppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Misslyckades med att läsa länken %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" @@ -3415,32 +3473,32 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, 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:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" @@ -3519,7 +3577,7 @@ msgstr "Misslyckades med att läsa vid beräkning av MD5" msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3629,40 +3687,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Virtuella paket som \"%s\" kan inte tas bort\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Paketet %s är inte installerat, så det tas inte bort\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Paketet %s är inte installerat, så det tas inte bort\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Observera, väljer \"%s\" istället för \"%s\"\n" -#~ 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" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Hoppar över %s, det är inte installerat och endast uppgraderingar har " -#~ "begärts.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s är redan den senaste versionen.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Valde version \"%s\" (%s) för \"%s\"\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Valde version \"%s\" (%s) för \"%s\"\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ignorera otillgängliga målutgåvan \"%s\" av paketet \"%s\"" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2014-04-20 09:38+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -156,9 +156,9 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -325,6 +325,7 @@ msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" @@ -352,12 +353,12 @@ msgstr "ไม่สามารถล็อคไดเรกทอรีดา msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -366,7 +367,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -377,78 +378,78 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -456,17 +457,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -474,19 +475,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +496,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -616,11 +617,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "ดาวน์โหลดไม่สำเร็จ" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -870,9 +871,9 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -885,9 +886,9 @@ msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1198,105 +1199,105 @@ msgstr "คุณอาจต้องเรียก 'apt-get -f install' เ msgid "Unmet dependencies. Try using -f." msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "ไม่ทราบ" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 msgid "[installed,local]" msgstr "[ติดตั้งอยู่,ในเครื่อง]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 msgid "[installed,automatic]" msgstr "[ติดตั้งอยู่,อัตโนมัติ]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 msgid "[installed]" msgstr "[ติดตั้งอยู่]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "[สามารถปรับรุ่นจาก: %s]" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "[ค่าตั้งตกค้าง]" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1304,27 +1305,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1333,7 +1334,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[Y/n]" @@ -1341,21 +1342,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "N" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1364,6 +1365,13 @@ msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1424,7 +1432,7 @@ msgstr "หลังจากการกระทำนี้ เนื้อ msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" @@ -1518,7 +1526,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" @@ -1558,7 +1566,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1569,22 +1577,63 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1597,23 +1646,23 @@ msgstr "" " อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n" " ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -1810,7 +1859,7 @@ msgid "The diversion path is too long" msgstr "พาธของการเบนแฟ้มยาวเกินไป" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "stat %s ไม่สำเร็จ" @@ -2153,27 +2202,27 @@ msgstr "ไม่สามารถเขียนลงแฟ้ม %s" msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "เตรียมรับคำตอบ" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "เรียกกลไกการแก้ปัญหาภายนอก" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" @@ -2190,7 +2239,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "รูปแบบของแฟ้มไม่ถูกต้อง" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2199,16 +2248,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2217,12 +2266,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2232,24 +2281,24 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, 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 คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2318,7 +2367,7 @@ msgstr "ไม่เข้าใจชนิดการตรึง %s" msgid "No priority (or zero) specified for pin" msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2327,12 +2376,12 @@ msgstr "" "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " "APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2729,46 +2778,46 @@ msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?" msgid "Is stdout a terminal?" msgstr "stdout เป็นเทอร์มินัลหรือไม่?" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2903,40 +2952,40 @@ msgstr "ไม่สามารถเปิดแฟ้ม %s" msgid "Could not open file descriptor %d" msgstr "ไม่สามารถเปิด file destriptor %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -3161,31 +3210,31 @@ msgstr "ไม่สามารถ mkstemp %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3262,41 +3311,46 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "ไม่มีรายการเลือกที่ตรง" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink %s ไม่สำเร็จ" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "แพกเกจไม่มีระเบียนควบคุม" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" @@ -3361,31 +3415,31 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" msgid " DeLink limit of %sB hit.\n" msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" @@ -3461,7 +3515,7 @@ msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนว msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3568,33 +3622,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "แพกเกจเสมือนอย่าง '%s' ไม่สามารถถอดถอนได้\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "หมายเหตุ: จะเลือก '%s' แทน '%s'\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "จะละเลยรุ่นเป้าหมาย '%s' ซึ่งไม่มีอยู่ของแพกเกจ '%s'" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -335,6 +335,7 @@ msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" @@ -362,19 +363,19 @@ msgstr "Hindi maaldaba ang directory ng download" 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:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -382,95 +383,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 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:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, 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:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +480,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +489,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +505,7 @@ 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:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +514,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -626,11 +627,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -834,9 +835,9 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Error sa pagbasa" @@ -849,9 +850,9 @@ msgid "Protocol corruption" msgstr "Sira ang protocol" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Error sa pagsulat" @@ -1168,108 +1169,108 @@ msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " o" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1277,27 +1278,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1306,7 +1307,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[O/h]" @@ -1314,21 +1315,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "H" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1337,6 +1338,14 @@ msgstr "Error sa pag-compile ng regex - %s" msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1403,7 +1412,7 @@ msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" @@ -1494,7 +1503,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" @@ -1541,7 +1550,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1552,22 +1561,65 @@ 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." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Sirang mga pakete" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" +#: apt-private/private-install.cc:815 +#, 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" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" + +#: apt-private/private-install.cc:831 +#, 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" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ay pinakabagong bersyon na.\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Ang napiling bersyon %s (%s) para sa %s\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Ang napiling bersyon %s (%s) para sa %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1576,25 +1628,25 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -1796,7 +1848,7 @@ msgid "The diversion path is too long" msgstr "Sobrang haba ng path na diversion" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" @@ -2149,27 +2201,27 @@ msgstr "Hindi makapagsulat sa %s" msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." @@ -2188,35 +2240,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2224,12 +2276,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2238,12 +2290,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2317,19 +2369,19 @@ msgstr "Hindi naintindihan ang uri ng pin %s" msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2729,44 +2781,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2903,40 +2955,40 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "Could not open file descriptor %d" msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -3166,31 +3218,31 @@ msgstr "Hindi ma-stat ang %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3275,26 +3327,26 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Walang mga pinili na tugma" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3303,16 +3355,21 @@ msgstr "" "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " "bersiyon ng apt, tanggalin at likhain muli ang database." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Bigo ang pagbasa ng link %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" @@ -3377,31 +3434,31 @@ msgstr "*** Bigo ang pag-link ng %s sa %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" @@ -3477,7 +3534,7 @@ msgstr "Bigo ang pagbasa habang tinutuos ang MD5" msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3576,40 +3633,9 @@ msgstr "" #~ msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Paunawa, pinili ang %s imbes na %s\n" -#~ 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" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s ay pinakabagong bersyon na.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Ang napiling bersyon %s (%s) para sa %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Ang napiling bersyon %s (%s) para sa %s\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Debian l10n Turkish\n" @@ -160,9 +160,9 @@ msgid " Version table:" msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -329,6 +329,7 @@ msgid "Couldn't find package %s" msgstr "%s paketi bulunamadı" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s elle kurulmuş olarak ayarlı.\n" @@ -358,12 +359,12 @@ msgstr "İndirme dizini kilitlenemiyor" msgid "Must specify at least one package to fetch source for" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -373,7 +374,7 @@ msgstr "" "yapılmaktadır:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -385,78 +386,78 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB kaynak arşivi indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -465,17 +466,17 @@ msgstr "" "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " "rehber sayfasındaki APT::Architectures kısmına göz atın." -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -484,7 +485,7 @@ msgstr "" "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " "bağımlılığı karşılanamıyor." -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -492,12 +493,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -506,7 +507,7 @@ msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " "gerekli sürüm şartlarını karşılamıyor" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +515,30 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s için inşa bağımlılıkları karşılanamadı." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -632,11 +633,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -860,9 +861,9 @@ msgstr "Bağlantı zaman aşımına uğradı" msgid "Server closed the connection" msgstr "Sunucu bağlantıyı kesti" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Okuma hatası" @@ -875,9 +876,9 @@ msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Yazma hatası" @@ -1190,108 +1191,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1299,27 +1300,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1328,7 +1329,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[E/h]" @@ -1336,21 +1337,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "H" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1359,6 +1360,14 @@ msgstr "Regex derleme hatası - %s" msgid "The update command takes no arguments" msgstr "'update' komutu bağımsız değişken almamaktadır" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1424,7 +1433,7 @@ msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" msgid "You don't have enough free space in %s." msgstr "%s içinde yeterli boş alanınız yok." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" @@ -1522,7 +1531,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:" @@ -1570,7 +1579,7 @@ msgstr "" "Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği " "vermeden deneyin (ya da bir çözüm belirtin)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1582,22 +1591,68 @@ msgstr "" "bazı paketlerin henüz oluşturulamamış ya da oluşturulmakta\n" "olduğunu gösterir." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Bozuk paketler" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Aşağıdaki ek paketler de kurulacak:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Önerilen paketler:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Tavsiye edilen paketler:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten " +"indirilemedi.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s zaten en yeni sürümde.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: " +"'%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1610,23 +1665,23 @@ msgstr "" " Unutmayın ki simülasyonda kilitleme yapılmaz,\n" " bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin." -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Bazı paketlerin kimlik denetimi yapılamadı" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Paketler doğrulanmadan kurulsun mu?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" @@ -1828,7 +1883,7 @@ msgid "The diversion path is too long" msgstr "Yönlendirme yolu çok uzun" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s durum bilgisi alınamadı" @@ -2174,27 +2229,27 @@ msgstr "%s dosyasına yazılamıyor" msgid "IO Error saving source cache" msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Çözücüye senaryo gönder" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Çözücüye istek gönder" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Çözüm almak için hazırlan" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Harici çözücüyü çalıştır" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "yeniden adlandırma başarısız, %s (%s -> %s)." @@ -2212,7 +2267,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2221,17 +2276,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2240,12 +2295,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2255,12 +2310,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2269,12 +2324,12 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2347,7 +2402,7 @@ msgstr "İğne türü %s anlaşılamadı" msgid "No priority (or zero) specified for pin" msgstr "İğne için öncelik belirlenmedi (ya da sıfır)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2356,12 +2411,12 @@ msgstr "" "\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt." "conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' paketi yapılandırılamadı. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2775,21 +2830,21 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2797,14 +2852,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2812,7 +2867,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2820,7 +2875,7 @@ msgid "" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2963,40 +3018,40 @@ msgstr "%s dosyası açılamadı" msgid "Could not open file descriptor %d" msgstr "Dosya tanımlayıcı %d açılamadı" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Altsüreç IPC'si oluşturulamadı" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Sıkıştırma programı çalıştırılamadı " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, yazılması gereken %llu bayt yazılamıyor" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" @@ -3228,31 +3283,31 @@ msgstr "%s durum bilgisi alınamadı" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Paket uzantı listesi çok uzun" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "%s dizinini işlemede hata" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Kaynak uzantı listesi çok uzun" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "İçindekiler dosyasına üstbilgi yazmada hata" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "%s içeriğini işlemede hata" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3335,26 +3390,26 @@ msgstr "" " -c=? Belirtilen yapılandırma dosyası kullan\n" " -o=? Yapılandırma seçeneği ayarla" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Hiçbir seçim eşleşmedi" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3362,16 +3417,21 @@ msgstr "" "Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme " "yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Veritabanı dosyası %s açılamadı: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s bağlantı okuması başarılamadı" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Arşivin denetim kaydı yok" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "İmleç alınamıyor" @@ -3436,31 +3496,31 @@ msgstr "*** %s, %s konumuna bağlanamadı" msgid " DeLink limit of %sB hit.\n" msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Arşivde paket alanı yok" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s için geçersiz kılma girdisi yok\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s geliştiricisi %s, %s değil\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Bellek ayırma yapılamadı" @@ -3536,7 +3596,7 @@ msgstr "MD5 hesaplanırken okunamadı" msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3647,38 +3707,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "'%s' gibi sanal paketler kaldırılamaz\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: " -#~ "'%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Bilgi, '%2$s' yerine '%1$s' seçiliyor\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten " -#~ "indirilemedi.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s zaten en yeni sürümde.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Mevcut olmayan hedef '%s' sürüm '%s' paketini ihmal et" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -165,9 +165,9 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -331,6 +331,7 @@ msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s позначений як встановлений вручну.\n" @@ -362,12 +363,12 @@ msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -376,7 +377,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -387,81 +388,81 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -470,17 +471,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +490,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +498,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +514,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +523,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -644,11 +645,11 @@ msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -874,9 +875,9 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Помилка зчитування" @@ -889,9 +890,9 @@ msgid "Protocol corruption" msgstr "Спотворений протокол" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Помилка запису" @@ -1208,108 +1209,108 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Незадоволені залежності. Спробуйте використати -f." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1317,27 +1318,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1346,7 +1347,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1354,21 +1355,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1377,6 +1378,15 @@ msgstr "Помилка компіляції регулярного виразу msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1443,7 +1453,7 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" @@ -1544,7 +1554,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:" @@ -1595,7 +1605,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи назв пакунків (або вкажіть рішення)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1606,22 +1616,67 @@ msgstr "" "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Зламані пакунки" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Вже встановлена найновіша версія %s.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Обрана версія '%s' (%s) для '%s'\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі " +"'%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Пакунок '%s' не встановлений, тому не видалений\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1634,23 +1689,23 @@ msgstr "" " Також не забувайте, що блокування вимикається,\n" " тому не очікуйте на відповідність поточній реальній ситуації!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Деякі пакунки неможливо автентифікувати" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Встановити ці пакунки без перевірки?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -1854,7 +1909,7 @@ msgid "The diversion path is too long" msgstr "Шлях 'diversion' є занадто довгим" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" @@ -2201,33 +2256,33 @@ msgstr "Неможливо записати в %s" msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження кешу вихідних текстів" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 #, fuzzy msgid "Send scenario to solver" msgstr "Відправити сценарій розв'язувачу" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 #, fuzzy msgid "Send request to solver" msgstr "Відправити запит розв'язувачу" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 #, fuzzy msgid "Prepare for receiving solution" msgstr "Пригодуватися до отримання розв'язку" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" "Зовнішній розв'язувач завершився невдало без відповідного повідомлення про " "помилку" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 #, fuzzy msgid "Execute external solver" msgstr "Виконати зовнішній розв'язувач" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "не вдалося перейменувати, %s (%s -> %s)." @@ -2245,7 +2300,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2254,16 +2309,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2272,12 +2327,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2287,12 +2342,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2301,12 +2356,12 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2380,7 +2435,7 @@ msgstr "Не зрозумів тип %s для фіксатора пакункі msgid "No priority (or zero) specified for pin" msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2389,12 +2444,12 @@ msgstr "" "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2801,22 +2856,22 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2824,7 +2879,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -2832,7 +2887,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2840,7 +2895,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " @@ -2849,7 +2904,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2994,40 +3049,40 @@ msgstr "Неможливо відкрити файл %s" msgid "Could not open file descriptor %d" msgstr "Неможливо відкрити файловий дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Не вдалося виконати компресор " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -3260,33 +3315,33 @@ msgstr "Неможливо прочитати атрибути %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Неможливо визначити версію debconf. Він встановлений?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Список розширень, припустимих для пакунків, занадто довгий" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Помилка обробки директорії %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "" "Список розширень, припустимих для пакунків з вихідними текстами, занадто " "довгий" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3374,26 +3429,26 @@ msgstr "" " -c=? Використати зазначений конфігураційний файл\n" " -o=? Вказати довільний параметр конфігурації" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Збігів не виявлено" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "У групі пакунків '%s' відсутні деякі файли" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД була пошкоджена, файл перейменований на %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД застаріла, намагаюсь оновити %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3401,16 +3456,21 @@ msgstr "" "Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка " "видаліть і наново створіть базу-даних." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не вдалося відкрити файл БД %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Не вдалося прочитати посилання (readlink) %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "В архіві немає запису 'control'" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Неможливо одержати курсор" @@ -3475,31 +3535,31 @@ msgstr "*** Не вдалося створити посилання %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr " Перевищено ліміт в %sB в DeLink.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Архів не мав поля 'package'" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, fuzzy, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення (override) для %s\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжується %s, а не %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Не вдалося виділити пам'ять" @@ -3575,7 +3635,7 @@ msgstr "Помилка зчитування під час обчислення M msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3688,39 +3748,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Віртуальні пакунки як '%s' не можуть бути видаленими\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі " -#~ "'%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Пакунок '%s' не встановлений, тому не видалений\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Помітьте, вибирається '%s' замість '%s'\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не " -#~ "встановлена.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Пропускається %s, пакунок не встановлений, а запитуються тільки " -#~ "оновлення.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Вже встановлена найновіша версія %s.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Обрана версія '%s' (%s) для '%s'\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Ігнорувати недоступний випуск '%s' пакунку '%s'" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2014-04-28 09:24+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -162,9 +162,9 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -339,6 +339,7 @@ msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành “được cài đặt bằng tay”.\n" @@ -368,12 +369,12 @@ msgstr "Không thể khoá thư mục tải về" msgid "Must specify at least one package to fetch source for" msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, 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:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -383,7 +384,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -394,79 +395,79 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, 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:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "Gặp lỗi khi lấy một số kho." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, 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:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, 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ài đặt chưa.\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh biên dịch “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -475,17 +476,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi biên dịch.\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +495,7 @@ msgstr "" "Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên " "gói “%s”" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +503,14 @@ msgid "" msgstr "" "Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là " "quá mới" -#: cmdline/apt-get.cc:1343 +#: cmdline/apt-get.cc:1351 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +519,7 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,30 +528,30 @@ msgstr "" "phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, 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:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s." -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -648,11 +649,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "Gặp lỗi khi tải về" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -910,9 +911,9 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Lỗi đọc" @@ -925,9 +926,9 @@ msgid "Protocol corruption" msgstr "Giao thức bị hỏng" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Lỗi ghi" @@ -1244,105 +1245,105 @@ msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa nhữ msgid "Unmet dependencies. Try using -f." msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”." -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "không hiểu" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[đã cài, có thể nâng cấp thành: %s]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "[đã cài,có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: %s]" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1350,27 +1351,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1379,7 +1380,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "[C/k]" @@ -1387,21 +1388,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "K" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1410,6 +1411,13 @@ msgstr "Lỗi biên dịch biểu thức chính quy - %s" msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1472,7 +1480,7 @@ msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng. msgid "You don't have enough free space in %s." msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" @@ -1570,7 +1578,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:" @@ -1611,7 +1619,7 @@ msgstr "" "Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà " "không có gói nào (hoặc chỉ định cách thức giải quyết)." -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1623,22 +1631,64 @@ msgstr "" "chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n" "hay chưa được chuyển ra khỏi phần Incoming (Đến)." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "Gói bị hỏng" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "Các gói đề nghị:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "Gói khuyến khích:" +#: apt-private/private-install.cc:815 +#, 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 đặt tùy chọn Nâng cấp.\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n" + +#: apt-private/private-install.cc:831 +#, 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 nó về.\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s là phiên bản mới nhất.\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n" + +#: apt-private/private-install.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n" + +#: apt-private/private-install.cc:937 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1651,23 +1701,23 @@ msgstr "" " Cần nhớ rằng chức năng khóa đã bị tắt,\n" " nên có thể nó không chính xác như khi làm thật!" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thực bị đè.\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "Cài đặt những gói này mà không cần thẩm tra?" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" @@ -1866,7 +1916,7 @@ msgid "The diversion path is too long" msgstr "Đường dẫn trệch đi quá dài" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" @@ -2213,27 +2263,27 @@ msgstr "Không thể ghi vào %s" msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "Gửi kịch bản đến bộ phân giải" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "Gửi yêu cầu đến bộ phân giải" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "Chuẩn bị để lấy cách giải quyết" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "Thi hành bộ phân giải từ bên ngoài" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." @@ -2250,7 +2300,7 @@ msgstr "Kích cỡ không khớp nhau" msgid "Invalid file format" msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2259,16 +2309,16 @@ msgstr "" "Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2277,12 +2327,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2293,12 +2343,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2307,12 +2357,12 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2389,7 +2439,7 @@ msgstr "Không hiểu kiểu ghim %s" msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2398,12 +2448,12 @@ msgstr "" "Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." "conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, c-format msgid "Could not configure '%s'. " msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2816,21 +2866,21 @@ msgstr "/dev/pts đã gắn chưa?" msgid "Is stdout a terminal?" msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -2838,14 +2888,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -2853,7 +2903,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" @@ -2861,7 +2911,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " "thống nội bộ" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3004,40 +3054,40 @@ msgstr "Không thể mở tập tin %s" msgid "Could not open file descriptor %d" msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format msgid "read, still have %llu to read but none left" msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" @@ -3271,31 +3321,31 @@ msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Danh sách mở rộng gói quá dài" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "Gặp lỗi khi xử lý thư mục %s" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Danh sách mở rộng nguồn quá dài" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Gặp lỗi khi xử lý nội dung %s" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3391,26 +3441,26 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "Không có cái được chọn khớp được" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format 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:51 +#: ftparchive/cachedb.cc:65 #, 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:69 +#: ftparchive/cachedb.cc:83 #, 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 thành %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -3418,16 +3468,21 @@ msgstr "" "Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " "apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, 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:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Gặp lỗi khi đọc liên kết %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "Không thể lấy con trỏ" @@ -3492,31 +3547,31 @@ msgstr "*** Gặp lỗi khi liên kết %s đến %s" msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè (override)\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo trì %s là %s không phải %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè (override) nguồn\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" @@ -3592,7 +3647,7 @@ msgstr "Gặp lỗi khi đọc trong khi tính MD5" msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 msgid "" "Usage: apt-internal-solver\n" "\n" @@ -3704,36 +3759,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Không thể gỡ bỏ được gói ảo như “%s”\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n" - -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Ghi chú: đang chọn “%s” thay cho “%s”\n" -#~ 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 đặt tùy chọn Nâng cấp.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n" - -#~ 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 nó về.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s là phiên bản mới nhất.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "Bỏ qua bản phát hành đích không sẵn sàng “%s” của gói “%s”" diff --git a/po/zh_CN.po b/po/zh_CN.po index 99926a97c..4e6c51bd5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -157,9 +157,9 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -327,6 +327,7 @@ msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" @@ -354,12 +355,12 @@ msgstr "无法锁定下载目录" msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -368,7 +369,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, fuzzy, c-format msgid "" "Please use:\n" @@ -379,114 +380,114 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, 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:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -495,37 +496,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -618,11 +619,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -825,9 +826,9 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "读错误" @@ -840,9 +841,9 @@ msgid "Protocol corruption" msgstr "协议有误" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "写出错" @@ -1152,108 +1153,108 @@ msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [已安装]" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1261,27 +1262,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1290,7 +1291,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1298,21 +1299,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1321,6 +1322,13 @@ msgstr "编译正则表达式时出错 - %s" msgid "The update command takes no arguments" msgstr " update 命令不需要参数" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1381,7 +1389,7 @@ msgstr "解压缩后将会空出 %sB 的空间。\n" msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" @@ -1471,7 +1479,7 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" @@ -1512,7 +1520,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1523,22 +1531,63 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "破损的软件包" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "推荐安装的软件包：" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" + +#: apt-private/private-install.cc:819 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "不能重新安装 %s，因为无法下载它。\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s 已经是最新的版本了。\n" + +#: apt-private/private-install.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "软件包 %s 还未安装，因而不会被卸载\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "软件包 %s 还未安装，因而不会被卸载\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1550,23 +1599,23 @@ msgstr "" " apt-get 需要 root 特权进行实际的执行。\n" " 同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "不经验证就安装这些软件包吗？" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -1763,7 +1812,7 @@ msgid "The diversion path is too long" msgstr "该转移路径太长" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" @@ -2107,27 +2156,27 @@ msgstr "无法写入 %s" msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" @@ -2145,35 +2194,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2182,12 +2231,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2196,12 +2245,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2272,7 +2321,7 @@ msgstr "无法识别锁定的类型 %s" msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2281,12 +2330,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2685,45 +2734,45 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 #, fuzzy msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" @@ -2857,40 +2906,40 @@ msgstr "无法打开文件 %s" msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -3115,31 +3164,31 @@ msgstr "无法读取 %s 的状态" msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3219,42 +3268,47 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期，现尝试进行升级 %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %s：%s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "无法读取符号链接 %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "无法获得游标" @@ -3319,31 +3373,31 @@ msgstr "*** 无法将 %s 链接到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" @@ -3419,7 +3473,7 @@ msgstr "在计算 MD5 校验和时无法读取数据" msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3525,36 +3579,9 @@ msgstr "" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "类似 %s 的虚拟软件包可以卸载\n" -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "软件包 %s 还未安装，因而不会被卸载\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "软件包 %s 还未安装，因而不会被卸载\n" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "注意，选取 %s 而非 %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "不能重新安装 %s，因为无法下载它。\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s 已经是最新的版本了。\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3a446ac4e..68dbb1f48 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: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -158,9 +158,9 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:43 #: cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -328,6 +328,7 @@ msgid "Couldn't find package %s" msgstr "無法找到套件 %s" #: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:855 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" @@ -355,19 +356,19 @@ msgstr "無法鎖定下載目錄" msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -375,114 +376,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:843 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 #: apt-private/private-install.cc:186 apt-private/private-install.cc:189 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:882 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:896 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:902 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:920 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: cmdline/apt-get.cc:925 apt-private/private-install.cc:313 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:942 +#: cmdline/apt-get.cc:950 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:962 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:963 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:991 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1010 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1029 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:1046 +#: cmdline/apt-get.cc:1054 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1101 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1271 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1289 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1304 +#: cmdline/apt-get.cc:1312 #, 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:1343 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -490,37 +491,37 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1357 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1380 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:1387 +#: cmdline/apt-get.cc:1395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1400 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正和 %s (%s) 連線" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1591 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1632 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -611,11 +612,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:53 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:66 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -817,9 +818,9 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475 -#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489 -#: apt-pkg/contrib/fileutl.cc:1491 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "讀取錯誤" @@ -832,9 +833,9 @@ msgid "Protocol corruption" msgstr "協定失敗" #: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 -#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606 -#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613 -#: apt-pkg/contrib/fileutl.cc:1638 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "寫入錯誤" @@ -1146,108 +1147,108 @@ msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。" msgid "Unmet dependencies. Try using -f." msgstr "未能滿足相依關係。試試 -f 選項。" -#: apt-private/private-output.cc:102 apt-private/private-show.cc:84 +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 #: apt-private/private-show.cc:89 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:232 +#: apt-private/private-output.cc:233 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "【已安裝】" -#: apt-private/private-output.cc:236 +#: apt-private/private-output.cc:237 #, fuzzy msgid "[installed,local]" msgstr "【已安裝】" -#: apt-private/private-output.cc:239 +#: apt-private/private-output.cc:240 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:241 +#: apt-private/private-output.cc:242 #, fuzzy msgid "[installed,automatic]" msgstr "【已安裝】" -#: apt-private/private-output.cc:243 +#: apt-private/private-output.cc:244 #, fuzzy msgid "[installed]" msgstr "【已安裝】" -#: apt-private/private-output.cc:247 +#: apt-private/private-output.cc:248 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:251 +#: apt-private/private-output.cc:252 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:351 +#: apt-private/private-output.cc:352 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有未滿足的相依關係：" -#: apt-private/private-output.cc:441 +#: apt-private/private-output.cc:442 #, c-format msgid "but %s is installed" msgstr "但 %s 卻已安裝" -#: apt-private/private-output.cc:443 +#: apt-private/private-output.cc:444 #, c-format msgid "but %s is to be installed" msgstr "但 %s 卻將被安裝" -#: apt-private/private-output.cc:450 +#: apt-private/private-output.cc:451 msgid "but it is not installable" msgstr "但它卻無法安裝" -#: apt-private/private-output.cc:452 +#: apt-private/private-output.cc:453 msgid "but it is a virtual package" msgstr "但它是虛擬套件" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not installed" msgstr "但它卻尚未安裝" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:456 msgid "but it is not going to be installed" msgstr "但它卻將不會被安裝" -#: apt-private/private-output.cc:460 +#: apt-private/private-output.cc:461 msgid " or" msgstr "或" -#: apt-private/private-output.cc:489 +#: apt-private/private-output.cc:490 msgid "The following NEW packages will be installed:" msgstr "下列【新】套件將會被安裝：" -#: apt-private/private-output.cc:515 +#: apt-private/private-output.cc:516 msgid "The following packages will be REMOVED:" msgstr "下列套件將會被【移除】：" -#: apt-private/private-output.cc:537 +#: apt-private/private-output.cc:538 msgid "The following packages have been kept back:" msgstr "下列套件將會維持其原有版本：" -#: apt-private/private-output.cc:558 +#: apt-private/private-output.cc:559 msgid "The following packages will be upgraded:" msgstr "下列套件將會被升級：" -#: apt-private/private-output.cc:579 +#: apt-private/private-output.cc:580 msgid "The following packages will be DOWNGRADED:" msgstr "下列套件將會被【降級】：" -#: apt-private/private-output.cc:599 +#: apt-private/private-output.cc:600 msgid "The following held packages will be changed:" msgstr "下列被保留 (hold) 的套件將會被更改：" -#: apt-private/private-output.cc:654 +#: apt-private/private-output.cc:655 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1255,27 +1256,27 @@ msgstr "" "【警告】：下列的基本套件都將被移除。\n" "除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:694 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升級 %lu 個，新安裝 %lu 個，" -#: apt-private/private-output.cc:697 +#: apt-private/private-output.cc:698 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個，" -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:700 #, c-format msgid "%lu downgraded, " msgstr "降級 %lu 個，" -#: apt-private/private-output.cc:701 +#: apt-private/private-output.cc:702 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "移除 %lu 個，有 %lu 個未被升級。\n" -#: apt-private/private-output.cc:705 +#: apt-private/private-output.cc:706 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個沒有完整得安裝或移除。\n" @@ -1284,7 +1285,7 @@ msgstr "%lu 個沒有完整得安裝或移除。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:727 +#: apt-private/private-output.cc:728 msgid "[Y/n]" msgstr "" @@ -1292,21 +1293,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:733 +#: apt-private/private-output.cc:734 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:744 +#: apt-private/private-output.cc:745 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:750 +#: apt-private/private-output.cc:751 msgid "N" msgstr "" -#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:773 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -1315,6 +1316,14 @@ msgstr "編譯正規表示式時發生錯誤 - %s" msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" +#: apt-private/private-update.cc:90 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1376,7 +1385,7 @@ msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" msgid "You don't have enough free space in %s." msgstr "在 %s 裡沒有足夠的的未使用空間。" -#: apt-private/private-install.cc:209 apt-private/private-download.cc:54 +#: apt-private/private-install.cc:209 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用" @@ -1470,7 +1479,7 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: apt-private/private-install.cc:501 apt-private/private-install.cc:643 msgid "The following information may help to resolve the situation:" msgstr "以下的資訊或許有助於解決當前的情況：" @@ -1515,7 +1524,7 @@ msgstr "" "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" "決方案）。" -#: apt-private/private-install.cc:627 +#: apt-private/private-install.cc:628 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" @@ -1525,22 +1534,63 @@ msgstr "" "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:649 msgid "Broken packages" msgstr "損毀的套件" -#: apt-private/private-install.cc:701 +#: apt-private/private-install.cc:702 msgid "The following extra packages will be installed:" msgstr "下列的額外套件將被安裝：" -#: apt-private/private-install.cc:791 +#: apt-private/private-install.cc:792 msgid "Suggested packages:" msgstr "建議套件：" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:793 msgid "Recommended packages:" msgstr "推薦套件：" +#: apt-private/private-install.cc:815 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" + +#: apt-private/private-install.cc:819 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" + +#: apt-private/private-install.cc:831 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "無法重新安裝 %s，因為它無法下載。\n" + +#: apt-private/private-install.cc:836 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s 已經是最新版本了。\n" + +#: apt-private/private-install.cc:884 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" + +#: apt-private/private-install.cc:889 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:931 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" + +#: apt-private/private-install.cc:937 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" + #: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" @@ -1549,23 +1599,23 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-download.cc:36 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：無法驗證下列套件！" -#: apt-private/private-download.cc:35 +#: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" msgstr "忽略了驗證警告。\n" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 msgid "Some packages could not be authenticated" msgstr "有部份套件無法驗證" -#: apt-private/private-download.cc:45 +#: apt-private/private-download.cc:50 msgid "Install these packages without verification?" msgstr "是否不經驗證就安裝這些套件？" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" @@ -1764,7 +1814,7 @@ msgid "The diversion path is too long" msgstr "要進行抽換的路徑過長" #: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:131 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" @@ -2108,27 +2158,27 @@ msgstr "無法寫入 %s" msgid "IO Error saving source cache" msgstr "在儲存來源快取時 IO 錯誤" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 +#: apt-pkg/edsp.cc:51 apt-pkg/edsp.cc:71 msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:216 +#: apt-pkg/edsp.cc:234 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:286 +#: apt-pkg/edsp.cc:313 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:293 +#: apt-pkg/edsp.cc:320 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 +#: apt-pkg/edsp.cc:612 apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:620 msgid "Execute external solver" msgstr "" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "無法重新命名，%s (%s -> %s)。" @@ -2146,35 +2196,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1579 +#: apt-pkg/acquire-item.cc:1581 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1595 +#: apt-pkg/acquire-item.cc:1597 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1637 +#: apt-pkg/acquire-item.cc:1639 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1675 +#: apt-pkg/acquire-item.cc:1677 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1697 +#: apt-pkg/acquire-item.cc:1699 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:1729 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2182,12 +2232,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742 +#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1865 +#: apt-pkg/acquire-item.cc:1867 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2196,12 +2246,12 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1931 +#: apt-pkg/acquire-item.cc:1933 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1989 +#: apt-pkg/acquire-item.cc:1991 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2271,19 +2321,19 @@ msgstr "無法分析鎖定類型 %s" msgid "No priority (or zero) specified for pin" msgstr "銷定並沒有優先順序之分（或零）" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 +#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "無法開啟檔案 %s" -#: apt-pkg/packagemanager.cc:577 +#: apt-pkg/packagemanager.cc:583 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2675,44 +2725,44 @@ msgstr "" msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1568 +#: apt-pkg/deb/dpkgpm.cc:1569 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1630 +#: apt-pkg/deb/dpkgpm.cc:1631 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1635 +#: apt-pkg/deb/dpkgpm.cc:1636 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1637 +#: apt-pkg/deb/dpkgpm.cc:1638 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1643 +#: apt-pkg/deb/dpkgpm.cc:1644 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1650 +#: apt-pkg/deb/dpkgpm.cc:1651 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663 +#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1684 +#: apt-pkg/deb/dpkgpm.cc:1685 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -2846,40 +2896,40 @@ msgstr "無法開啟檔案 %s" msgid "Could not open file descriptor %d" msgstr "無法開啟管線給 %s 使用" -#: apt-pkg/contrib/fileutl.cc:1314 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "無法建立子程序 IPC" -#: apt-pkg/contrib/fileutl.cc:1372 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "無法執行壓縮程式" -#: apt-pkg/contrib/fileutl.cc:1513 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "讀取，仍有 %lu 未讀但已無空間" -#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:1913 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1925 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "在同步檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1936 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1949 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -3106,31 +3156,31 @@ msgstr "無法取得 %s 的狀態" msgid "Cannot get debconf version. Is debconf installed?" msgstr "無法取得 debconf 版本。是否有安裝 debconf？" -#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "套件延伸列表過長" -#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, c-format msgid "Error processing directory %s" msgstr "處理目錄 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:271 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "原始碼的延伸列表太長" -#: ftparchive/apt-ftparchive.cc:388 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "寫入標頭資訊到內容檔時發生錯誤" -#: ftparchive/apt-ftparchive.cc:418 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "處理內容 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:606 +#: ftparchive/apt-ftparchive.cc:626 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -3208,26 +3258,26 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:841 msgid "No selections matched" msgstr "找不到符合的選項" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:919 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 少了部份檔案" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB 已損毀，檔案被更名為 %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:83 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊，嘗試升級 %s" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:94 #, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " @@ -3235,16 +3285,21 @@ msgid "" msgstr "" "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" -#: ftparchive/cachedb.cc:85 +#: ftparchive/cachedb.cc:99 #, c-format msgid "Unable to open DB file %s: %s" msgstr "無法開啟 DB 檔 %s: %s" -#: ftparchive/cachedb.cc:253 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "無法讀取連結 %s" + +#: ftparchive/cachedb.cc:365 msgid "Archive has no control record" msgstr "套件檔沒有 control 記錄" -#: ftparchive/cachedb.cc:494 +#: ftparchive/cachedb.cc:594 msgid "Unable to get a cursor" msgstr "無法取得遊標" @@ -3309,31 +3364,31 @@ msgstr "*** 無法將 %s 連結到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:417 msgid "Archive had no package field" msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format msgid " %s has no override entry\n" msgstr " %s 沒有重新定義項目\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的維護者是 %s，而非 %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:706 #, c-format msgid " %s has no source override entry\n" msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:710 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼重新定義項目\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - 無法配置記憶體" @@ -3409,7 +3464,7 @@ msgstr "在計算 MD5 時無法讀取到資料" msgid "Problem unlinking %s" msgstr "在取消 %s 的連結時發生問題" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:47 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -3505,38 +3560,9 @@ msgstr "" #~ msgstr "套件 %s 沒有可安裝的候選版本" #, fuzzy -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" - -#, fuzzy -#~ msgid "Package '%s' is not installed, so not removed\n" -#~ msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "注意，選擇了以 %s 替代 %s\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" - -#, fuzzy -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "無法重新安裝 %s，因為它無法下載。\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s 已經是最新版本了。\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" - #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員" diff --git a/test/integration/cachedb-lp1274466-old-format.db b/test/integration/cachedb-lp1274466-old-format.db Binary files differnew file mode 100644 index 000000000..88da5f1ee --- /dev/null +++ b/test/integration/cachedb-lp1274466-old-format.db diff --git a/test/integration/deb-lp1274466-cachedb.deb b/test/integration/deb-lp1274466-cachedb.deb Binary files differnew file mode 100644 index 000000000..43d7ee6f1 --- /dev/null +++ b/test/integration/deb-lp1274466-cachedb.deb diff --git a/test/integration/framework b/test/integration/framework index eda3cebad..31863af3c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -36,7 +36,7 @@ msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}"; } msgtest() { while [ -n "$1" ]; do echo -n "${CINFO}$1${CCMD} " - echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " + echo -n "$(echo "$2" | sed -e 's#^apt\([cgfs]\)#apt-\1#')${CINFO} " shift if [ -n "$1" ]; then shift; else break; fi done @@ -102,10 +102,10 @@ runapt() { local CMD="$1" shift case $CMD in - sh|aptitude|*/*) ;; + sh|aptitude|*/*|command) ;; *) CMD="${BUILDDIRECTORY}/$CMD";; esac - MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@" + MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${LIBRARYPATH} $CMD "$@" } aptconfig() { runapt apt-config "$@"; } aptcache() { runapt apt-cache "$@"; } @@ -114,11 +114,13 @@ aptget() { runapt apt-get "$@"; } aptftparchive() { runapt apt-ftparchive "$@"; } aptkey() { runapt apt-key "$@"; } aptmark() { runapt apt-mark "$@"; } +aptsortpkgs() { runapt apt-sortpkgs "$@"; } apt() { runapt apt "$@"; } apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; } aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; } aptitude() { runapt aptitude "$@"; } aptextracttemplates() { runapt apt-extracttemplates "$@"; } +aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; } dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" @@ -127,11 +129,9 @@ dpkgcheckbuilddeps() { command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@" } gdb() { - echo "gdb: run »$*«" - CMD="$1" + local CMD="$1" shift - - APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${LIBRARYPATH} command gdb ${BUILDDIRECTORY}/$CMD --args ${BUILDDIRECTORY}/$CMD "$@" + runapt command gdb --quiet -ex run "${BUILDDIRECTORY}/$CMD" --args "${BUILDDIRECTORY}/$CMD" "$@" } gpg() { # see apt-key for the whole trickery. Setup is done in setupenvironment @@ -180,6 +180,7 @@ setupenvironment() { METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} + APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- @@ -193,6 +194,12 @@ setupenvironment() { touch var/lib/dpkg/available mkdir -p usr/lib/apt ln -s ${METHODSDIR} usr/lib/apt/methods + if [ "$BUILDDIRECTORY" = "$LIBRARYPATH" ]; then + mkdir -p usr/lib/apt/solvers + ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/solvers/dump + ln -s "${BUILDDIRECTORY}/apt-internal-solver" usr/lib/apt/solvers/apt + echo "Dir::Bin::Solvers \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/solvers\";" > etc/apt/apt.conf.d/externalsolver.conf + fi # use the autoremove from the BUILDDIRECTORY if its there, otherwise # system if [ -e ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove ]; then @@ -226,6 +233,7 @@ setupenvironment() { fi echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf echo 'quiet::NoUpdate "true";' >> aptconfig.conf + echo 'quiet::NoStatistic "true";' >> aptconfig.conf echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary configcompression '.' 'gz' #'bz2' 'lzma' 'xz' @@ -244,7 +252,8 @@ setupenvironment() { gpg --quiet --check-trustdb --secret-keyring $SECRETKEYRING --keyring $SECRETKEYRING >/dev/null 2>&1 # cleanup the environment a bit - export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" + # prefer our apt binaries over the system apt binaries + export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin" export LC_ALL=C.UTF-8 unset LANGUAGE APT_CONFIG unset GREP_OPTIONS DEB_BUILD_PROFILES diff --git a/test/integration/run-tests b/test/integration/run-tests index d700cc3fc..d39daeee5 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -39,7 +39,7 @@ fi TOTAL="$(run-parts --list $DIR | grep '/test-' | wc -l)" for testcase in $(run-parts --list $DIR | grep '/test-'); do if [ "$MSGLEVEL" -le 2 ]; then - echo -n "${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: " + echo -n "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: " else echo "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}" fi diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver new file mode 100755 index 000000000..0622941ce --- /dev/null +++ b/test/integration/skip-aptwebserver @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' + +buildsimplenativepackage 'apt' 'all' '1.0' 'stable' + +setupaptarchive +changetowebserver + +rm -rf rootdir/var/lib/apt/lists +aptget update -qq +testequal 'Hit http://localhost stable InRelease +Hit http://localhost stable/main Sources +Hit http://localhost stable/main amd64 Packages +Hit http://localhost stable/main Translation-en +Reading package lists...' aptget update + +mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial +aptget update + diff --git a/test/integration/test-apt-cli-update b/test/integration/test-apt-cli-update new file mode 100755 index 000000000..8237bf03f --- /dev/null +++ b/test/integration/test-apt-cli-update @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +insertpackage 'unstable' 'foo' 'all' '2.0' +insertinstalledpackage 'foo' 'all' '1.0' + +setupaptarchive + +APTARCHIVE=$(readlink -f ./aptarchive) + +testequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -q diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb index 147272a2c..0e1986bcd 100755 --- a/test/integration/test-apt-ftparchive-cachedb +++ b/test/integration/test-apt-ftparchive-cachedb @@ -5,7 +5,7 @@ ensure_correct_packages_file() { testequal "Package: foo Priority: optional Section: others -Installed-Size: 29 +$(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | sed 's#^ ##') Maintainer: Joe Sixpack <joe@example.org> Architecture: i386 Version: 1 @@ -25,7 +25,7 @@ usr/share/doc/foo/copyright others/foo" cat ./aptarchive/dists/test/Conte TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' mkdir -p aptarchive/dists/test/main/i18n/ mkdir -p aptarchive/dists/test/main/source/ diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466 new file mode 100755 index 000000000..579ae33a6 --- /dev/null +++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466 @@ -0,0 +1,53 @@ +#!/bin/sh +set -e + + +# +# main() +# +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture "i386" + +# gather the db and the deb, ensure mtime is not modfied as its saved in the DB +cp -p $TESTDIR/deb-lp1274466-cachedb.deb foo_1_i386.deb +cp -p $TESTDIR/cachedb-lp1274466-old-format.db old-format.db + +# verify that the format is different +testsuccess aptftparchive --db new-format.db packages . +db_dump new-format.db > new-format.dump +db_dump old-format.db > old-format.dump +testfailure diff -u old-format.dump new-format.dump + +# ensure the new format as the sha512 +testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c new-format.dump +# but the old format does not +testfailure grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump + +# regression test for corruption with previous generation of cachedb +testequal "Package: foo +Priority: optional +Section: others +Installed-Size: 29 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: i386 +Version: 1 +Filename: ./foo_1_i386.deb +Size: 1270 +MD5sum: 85d0e908c1a897700e2c5dea72d7e3c0 +SHA1: 858b09169032b7925a0e463f46b6634243fc40ce +SHA256: 3750a2c9c6b5beee7f307564be3d51d3ec7cbb78fa4f0b47f84a7c41477bff59 +SHA512: 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c +Description: an autogenerated dummy foo=1/test + If you find such a package installed on your system, + something went horribly wrong! They are autogenerated + und used only by testcases and surf no other propose… +" aptftparchive --db old-format.db packages . + +# ensure that the db is updated and contains the new sha512 +db_dump old-format.db > old-format.dump + +testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump + + diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb index 676fe9fe5..e7b148530 100755 --- a/test/integration/test-apt-ftparchive-src-cachedb +++ b/test/integration/test-apt-ftparchive-src-cachedb @@ -43,7 +43,7 @@ Checksums-Sha256: Checksums-Sha512: 3da0240fd764657c2f3661b4d750578a9a99b0580591b133756379d48117ebda87a5ed2467f513200d6e7eaf51422cbe91c15720eef7fb4bba2cc8ff81ebc547 171 foo_1.0.dsc cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e 0 foo_1.0.tar.gz -" apt-sortpkgs ./aptarchive/dists/test/main/source/Sources +" aptsortpkgs ./aptarchive/dists/test/main/source/Sources } create_source_files() { @@ -177,6 +177,11 @@ assert_correct_sources_file mkdir aptarchive/pool/invalid printf "meep" > aptarchive/pool/invalid/invalid_1.0.dsc testequal " +E: Could not find a record in the DSC 'aptarchive/pool/invalid/invalid_1.0.dsc'" aptftparchive sources aptarchive/pool/invalid +rm -f aptarchive/pool/invalid/invalid_1.0.dsc + +printf "meep: yes" > aptarchive/pool/invalid/invalid_1.0.dsc +testequal " E: Could not find a Source entry in the DSC 'aptarchive/pool/invalid/invalid_1.0.dsc'" aptftparchive sources aptarchive/pool/invalid rm -f aptarchive/pool/invalid/invalid_1.0.dsc diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep new file mode 100755 index 000000000..f71beae9c --- /dev/null +++ b/test/integration/test-apt-get-build-dep @@ -0,0 +1,126 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'debhelper' 'i386' '7' 'stable' +buildsimplenativepackage 'build-essential' 'i386' '1' 'stable' + +setupaptarchive +cat > 2vcard_0.5-3.dsc <<EOF +Format: 1.0 +Source: 2vcard +Binary: 2vcard +Architecture: all +Version: 0.5-3 +Maintainer: Martin Albisetti <argentina@gmail.com> +Uploaders: Marcela Tiznado <mlt@debian.org> +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0.37) +Checksums-Sha1: + b7f1ce31ec856414a3f0f1090689f91aa7456d56 9398 2vcard_0.5.orig.tar.gz + 5f9acd07ebda6ab00fa6b4fe3198c13e94090862 2036 2vcard_0.5-3.diff.gz +Checksums-Sha256: + efdc22859ac2f8f030d038dc4faa9020082ebae34212498c288968ffd45c9764 9398 2vcard_0.5.orig.tar.gz + 82673ff3456af571094066c89bcea87b25c23c87cf1d0050b731e5222563626b 2036 2vcard_0.5-3.diff.gz +Files: + f73a69c170f772f3f6e75f2d11bbb792 9398 2vcard_0.5.orig.tar.gz + 1e806d32233af87437258d86b1561f57 2036 2vcard_0.5-3.diff.gz +EOF + +testequal "Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-essential debhelper +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst build-essential (1 stable [i386]) +Inst debhelper (7 stable [i386]) +Conf build-essential (1 stable [i386]) +Conf debhelper (7 stable [i386])" aptget build-dep -s 2vcard_0.5-3.dsc + +cat > 2vcard_0.5-3.dsc <<EOF +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +Format: 1.0 +Source: 2vcard +Binary: 2vcard +Architecture: all +Version: 0.5-3 +Maintainer: Martin Albisetti <argentina@gmail.com> +Uploaders: Marcela Tiznado <mlt@debian.org> +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0.37) +Checksums-Sha1: + b7f1ce31ec856414a3f0f1090689f91aa7456d56 9398 2vcard_0.5.orig.tar.gz + 5f9acd07ebda6ab00fa6b4fe3198c13e94090862 2036 2vcard_0.5-3.diff.gz +Checksums-Sha256: + efdc22859ac2f8f030d038dc4faa9020082ebae34212498c288968ffd45c9764 9398 2vcard_0.5.orig.tar.gz + 82673ff3456af571094066c89bcea87b25c23c87cf1d0050b731e5222563626b 2036 2vcard_0.5-3.diff.gz +Files: + f73a69c170f772f3f6e75f2d11bbb792 9398 2vcard_0.5.orig.tar.gz + 1e806d32233af87437258d86b1561f57 2036 2vcard_0.5-3.diff.gz + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAkijKhsACgkQsrBfRdYmq7aA2gCfaOW9riTYVQMx5ajKQVAcctlC +z2UAn1oXgTai6opwhVfkxrlmJ+iRxzuc +=4eRd +-----END PGP SIGNATURE----- +EOF + +testequal "Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-essential debhelper +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst build-essential (1 stable [i386]) +Inst debhelper (7 stable [i386]) +Conf build-essential (1 stable [i386]) +Conf debhelper (7 stable [i386])" aptget build-dep --simulate 2vcard_0.5-3.dsc + + +# unpacked source dir +mkdir -p foo-1.0/debian +cat > foo-1.0/debian/control <<'EOF' +Source: apturl +Section: admin +Priority: optional +Maintainer: Michael Vogt <mvo@ubuntu.com> +Build-Depends: debhelper (>= 7) +X-Python3-Version: >= 3.2 +Standards-Version: 3.9.3 + +Package: apturl-common +Architecture: any +Depends: ${python3:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python3-apt, + python3-update-manager +Replaces: apturl (<< 0.3.6ubuntu2) +Description: install packages using the apt protocol - common data + AptUrl is a simple graphical application that takes an URL (which follows the + apt-protocol) as a command line option, parses it and carries out the + operations that the URL describes (that is, it asks the user if he wants the + indicated packages to be installed and if the answer is positive does so for + him). + . + This package contains the common data shared between the frontends. + +EOF + +testequal "Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + build-essential debhelper +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst build-essential (1 stable [i386]) +Inst debhelper (7 stable [i386]) +Conf build-essential (1 stable [i386]) +Conf debhelper (7 stable [i386])" aptget build-dep --simulate ./foo-1.0 diff --git a/test/integration/test-apt-get-source-authenticated b/test/integration/test-apt-get-source-authenticated new file mode 100755 index 000000000..2cee13923 --- /dev/null +++ b/test/integration/test-apt-get-source-authenticated @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Regression test for debian bug #749795. Ensure that we fail with +# a error if apt-get source foo will download a source that comes +# from a unauthenticated repository +# +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +# a "normal" package with source and binary +buildsimplenativepackage 'foo' 'all' '2.0' + +setupaptarchive --no-update + +APTARCHIVE=$(readlink -f ./aptarchive) +rm -f $APTARCHIVE/dists/unstable/*Release* + +# update without authenticated InRelease file +testsuccess aptget update + +# this all should fail +testfailure aptget install -y foo +testfailure aptget source foo + +# allow overriding the warning +testsuccess aptget source --allow-unauthenticated foo diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index 9d250e949..7ddf355f3 100755 --- a/test/integration/test-apt-progress-fd +++ b/test/integration/test-apt-progress-fd @@ -16,7 +16,7 @@ setupaptarchive exec 3> apt-progress.log testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3 testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 +dlstatus:1:20:Retrieving file 1 of 1 pmstatus:dpkg-exec:0:Running dpkg pmstatus:testing:0:Installing testing (amd64) pmstatus:testing:20:Preparing testing (amd64) @@ -31,7 +31,7 @@ pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log exec 3> apt-progress.log testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3 testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 +dlstatus:1:20:Retrieving file 1 of 1 pmstatus:dpkg-exec:0:Running dpkg pmstatus:testing:20:Preparing testing (amd64) pmstatus:testing:40:Unpacking testing (amd64) @@ -56,7 +56,7 @@ testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3 # and compare testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 +dlstatus:1:20:Retrieving file 1 of 1 pmstatus:dpkg-exec:0:Running dpkg pmstatus:testing2:0:Installing testing2 (i386) pmstatus:testing2:20:Preparing testing2 (i386) diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 5f54b7531..d8b2334ad 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -23,14 +23,14 @@ Description: summay msgtest 'Test sources.list' 'old style' echo "deb http://ftp.debian.org/debian stable main" > $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris msgtest 'Test sources.list' 'simple deb822' echo "$BASE" > $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris @@ -39,29 +39,29 @@ msgtest 'Test deb822 with' 'two entries' echo "$BASE" > $SOURCES echo "" >> $SOURCES echo "$BASE" | sed s/stable/unstable/ >> $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 -'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris # two suite entries msgtest 'Test deb822 with' 'two Suite entries' echo "$BASE" | sed -e "s/stable/stable unstable/" > $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 -'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris msgtest 'Test deb822' 'architecture option' echo "$BASE" > $SOURCES echo "Architectures: amd64 armel" >> $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris @@ -85,19 +85,19 @@ testempty aptget update --print-uris # multiple URIs msgtest 'Test deb822 sources.list file which has' 'Multiple URIs work' echo "$BASE" | sed -e 's#http://ftp.debian.org/debian#http://ftp.debian.org/debian http://ftp.de.debian.org/debian#' > $SOURCES -testequal --nomsg "'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.de.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.de.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.de.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.de.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.de.debian.org/debian/dists/stable/InRelease' ftp.de.debian.org_debian_dists_stable_InRelease 0 -'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris # multiple Type in one field msgtest 'Test deb822 sources.list file which has' 'Multiple Types work' echo "$BASE" | sed -e 's#Types: deb#Types: deb deb-src#' > $SOURCES -testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0 : -'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 : -'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 : +testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0 +'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 +'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris # a Suite @@ -107,6 +107,6 @@ Types: deb URIs: http://emacs.naquadah.org Suites: stable/ EOF -testequal --nomsg "'http://emacs.naquadah.org/stable/Packages.bz2' emacs.naquadah.org_stable_Packages 0 : -'http://emacs.naquadah.org/stable/en.bz2' emacs.naquadah.org_stable_en 0 : +testequal --nomsg "'http://emacs.naquadah.org/stable/Packages.bz2' emacs.naquadah.org_stable_Packages 0 +'http://emacs.naquadah.org/stable/en.bz2' emacs.naquadah.org_stable_en 0 'http://emacs.naquadah.org/stable/InRelease' emacs.naquadah.org_stable_InRelease 0 " aptget update --print-uris diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index a05ed5fa6..8da0a52d2 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -13,7 +13,7 @@ setupflataptarchive testaptgetupdate() { rm -rf rootdir/var/lib/apt aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true - sed -i -e '/^Fetched / d' -e '/Ign / d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff + sed -i -e '/Ign / d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff GIVEN="$1" shift msgtest "Test for correctness of" "apt-get update with $*" diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep index e0305b64b..536124c2c 100755 --- a/test/integration/test-bug-618288-multiarch-same-lockstep +++ b/test/integration/test-bug-618288-multiarch-same-lockstep @@ -16,22 +16,23 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' '' buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required' setupaptarchive -aptget dist-upgrade -s >output.apt 2>&1 +testsuccess aptget dist-upgrade -s -o Debug::pkgPackageManager=1 # order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together -LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)" -LS_U_INT="$(grep -o -n '^Inst libsame:i386 ' output.apt | cut -d: -f1)" -LS_C_AMD="$(grep -o -n '^Conf libsame ' output.apt | cut -d: -f1)" -LS_C_INT="$(grep -o -n '^Conf libsame:i386 ' output.apt | cut -d: -f1)" +OUTPUT=rootdir/tmp/testsuccess.output +LS_U_AMD="$(grep -o -n '^Inst libsame ' $OUTPUT | cut -d: -f1)" +LS_U_INT="$(grep -o -n '^Inst libsame:i386 ' $OUTPUT | cut -d: -f1)" +LS_C_AMD="$(grep -o -n '^Conf libsame ' $OUTPUT | cut -d: -f1)" +LS_C_INT="$(grep -o -n '^Conf libsame:i386 ' $OUTPUT | cut -d: -f1)" -msgtest 'Test if libsame:amd64 unpack before configure' +msgtest 'Test if' 'libsame:amd64 unpack before configure' test "$LS_U_AMD" -lt "$LS_C_AMD" && msgpass || msgfail -msgtest 'Test if libsame:i386 unpack before configure' +msgtest 'Test if' 'libsame:i386 unpack before configure' test "$LS_U_INT" -lt "$LS_C_INT" && msgpass || msgfail -msgtest 'Test if libsame:amd64 unpack is before libsame:i386 configure' +msgtest 'Test if' 'libsame:amd64 unpack is before libsame:i386 configure' test "$LS_U_AMD" -lt "$LS_C_INT" && msgpass || msgfail -msgtest 'Test if libsame:i386 unpack is before libsame:amd64 configure' +msgtest 'Test if' 'libsame:i386 unpack is before libsame:amd64 configure' test "$LS_U_INT" -lt "$LS_C_AMD" && msgpass || msgfail diff --git a/test/integration/test-bug-673536-pre-depends-breaks-loop b/test/integration/test-bug-673536-pre-depends-breaks-loop index f6a90b21f..21bd5e065 100755 --- a/test/integration/test-bug-673536-pre-depends-breaks-loop +++ b/test/integration/test-bug-673536-pre-depends-breaks-loop @@ -6,18 +6,32 @@ TESTDIR=$(readlink -f $(dirname $0)) setupenvironment configarchitecture 'native' -buildsimplenativepackage 'basic' 'native' '1' 'stable' +buildsimplenativepackage 'advanced' 'native' '1' 'stable' +buildsimplenativepackage 'advanced' 'native' '2' 'unstable' 'Pre-Depends: basic' buildsimplenativepackage 'basic' 'native' '2' 'unstable' 'Pre-Depends: common' -buildsimplenativepackage 'common' 'native' '2' 'unstable' 'Breaks: basic (<= 1)' + +buildsimplenativepackage 'common' 'native' '2~conflict' 'unstable-conflict' 'Conflicts: advanced (<= 1)' +buildsimplenativepackage 'common' 'native' '2~break' 'unstable-break' 'Conflicts: advanced (<= 1)' setupaptarchive # we check with 'real' packages here as the simulation reports a 'Conf broken' # which is technical correct for the simulation, but testing errormsg is ugly -testsuccess aptget install basic=1 -y -testdpkginstalled basic -testdpkgnotinstalled common +cp -a rootdir/var/lib/dpkg/status dpkg.status.backup + +testloopbreak() { + cp -a dpkg.status.backup rootdir/var/lib/dpkg/status + rm -f rootdir/var/lib/apt/extended_states + + + testsuccess aptget install advanced=1 -y -t "$1" -o Debug::pkgPackageManager=1 + testdpkginstalled advanced + testdpkgnotinstalled basic common + + testsuccess aptget dist-upgrade -y -t "$1" -o Debug::pkgPackageManager=1 + testdpkginstalled advanced basic common +} -testsuccess aptget dist-upgrade -y -testdpkginstalled basic common +testloopbreak 'unstable-break' +testloopbreak 'unstable-conflict' diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages index 879d6a3bc..65862c572 100755 --- a/test/integration/test-bug-683786-build-dep-on-virtual-packages +++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages @@ -38,8 +38,8 @@ Building dependency tree... The following NEW packages will be installed: po-debconf 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst po-debconf (1 unstable, unstable [all]) -Conf po-debconf (1 unstable, unstable [all])' aptget build-dep dash -s +Inst po-debconf (1 unstable [all]) +Conf po-debconf (1 unstable [all])' aptget build-dep dash -s testequal 'Reading package lists... Building dependency tree... diff --git a/test/integration/test-bug-712435-missing-descriptions b/test/integration/test-bug-712435-missing-descriptions index 53ecbbeb3..7a3518745 100755 --- a/test/integration/test-bug-712435-missing-descriptions +++ b/test/integration/test-bug-712435-missing-descriptions @@ -87,13 +87,10 @@ $DESCRIPTION Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " aptcache show apt-normal -# displaying the translated Description would be equally valid, -# but we assume only one description is in a Packages file and -# so we prefer "Description" over "Description-*" currently. for variant in 'below' 'middle' 'top'; do testequal "Package: apt-both-$variant $PACKAGESTANZA -$DESCRIPTION +$TRANSDESCRIPTION Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb " aptcache show apt-both-$variant done @@ -122,7 +119,7 @@ X-Some-Flag: yes testequal "Package: apt-intermixed2 $PACKAGESTANZA -$DESCRIPTION +$TRANSDESCRIPTION Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa X-Some-Flag: yes X-Foo-Flag: Something with a Description @@ -131,7 +128,7 @@ X-Bar-Flag: no testequal "Package: apt-intermixed3 $PACKAGESTANZA -$DESCRIPTION +$TRANSDESCRIPTION Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa X-Some-Flag: yes X-Foo-Flag: Something with a Description diff --git a/test/integration/test-bug-722207-print-uris-even-if-very-quiet b/test/integration/test-bug-722207-print-uris-even-if-very-quiet index f2d95da19..9a5685703 100755 --- a/test/integration/test-bug-722207-print-uris-even-if-very-quiet +++ b/test/integration/test-bug-722207-print-uris-even-if-very-quiet @@ -16,10 +16,10 @@ setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) -testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 MD5Sum:" aptget upgrade -qq --print-uris -testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 MD5Sum:" aptget dist-upgrade -qq --print-uris -testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 MD5Sum:" aptget install apt -qq --print-uris -testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 MD5Sum:" aptget download apt -qq --print-uris +testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget upgrade -qq --print-uris +testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget dist-upgrade -qq --print-uris +testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget install apt -qq --print-uris +testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget download apt -qq --print-uris testequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e 'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source apt -qq --print-uris testequal "'http://packages.debian.org/changelogs/pool/main/apt/apt_2/changelog'" aptget changelog apt -qq --print-uris diff --git a/test/integration/test-bug-745036-new-foreign-invalidates-cache b/test/integration/test-bug-745036-new-foreign-invalidates-cache new file mode 100755 index 000000000..490cbecdd --- /dev/null +++ b/test/integration/test-bug-745036-new-foreign-invalidates-cache @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +insertpackage 'unstable' 'cool-foo' 'amd64' '1.0' 'Depends: foo' +insertpackage 'unstable' 'foo' 'amd64' '1.0' 'Multi-Arch: foreign' +insertinstalledpackage 'cool-foo' 'amd64' '1.0' 'Depends: foo' +insertinstalledpackage 'foo' 'amd64' '1.0' 'Multi-Arch: foreign' + +setupaptarchive + +testsuccess aptget check -s + +configarchitecture 'amd64' 'i386' +testequal 'E: The package cache was built for different architectures: amd64 vs amd64,i386' aptget check -s -o pkgCacheFile::Generate=false + +testsuccess aptget check -s + +insertinstalledpackage 'awesome-foo' 'i386' '1.0' 'Depends: foo' + +testsuccess aptget check -s + +testsuccess aptget update --no-download + +testsuccess aptget check -s diff --git a/test/integration/test-bug-745046-candidate-propagation-fails b/test/integration/test-bug-745046-candidate-propagation-fails new file mode 100755 index 000000000..e4aa67a72 --- /dev/null +++ b/test/integration/test-bug-745046-candidate-propagation-fails @@ -0,0 +1,39 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' + +insertinstalledpackage 'gedit' 'amd64' '1' + +insertpackage 'unstable' 'gedit' 'amd64' '1' +insertpackage 'experimental' 'gedit' 'amd64' '2' 'Depends: common (>= 2)' + +setupaptarchive + +testequal "Reading package lists... +Building dependency tree... +Selected version '2' (experimental [amd64]) for 'gedit' +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + gedit : Depends: common (>= 2) but it is not installable +E: Unable to correct problems, you have held broken packages." aptget install gedit/experimental -sq=0 + +insertinstalledpackage 'common' 'amd64' '2' + +testequal "Reading package lists... +Building dependency tree... +Selected version '2' (experimental [amd64]) for 'gedit' +The following packages will be upgraded: + gedit +1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst gedit [1] (2 experimental [amd64]) +Conf gedit (2 experimental [amd64])" aptget install gedit/experimental -sq=0 diff --git a/test/integration/test-bug-747261-arch-specific-conflicts b/test/integration/test-bug-747261-arch-specific-conflicts new file mode 100755 index 000000000..be971b89e --- /dev/null +++ b/test/integration/test-bug-747261-arch-specific-conflicts @@ -0,0 +1,51 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'sparc' 'armel' + +msgtest 'Check that dpkg supports' 'arch-specific dependencies' +set +e +# this fails always, the question is just how it fails +dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null 2>/dev/null >/dev/null +RETURNCODE=$? +set -e +if [ "$RETURNCODE" != '1' ]; then + dpkg-checkbuilddeps -d 'foobar:barfoo' /dev/null || true + echo "Command had returncode: $RETURNCODE" + msgskip + exit 0 +else + msgpass +fi + +buildsimplenativepackage 'libc6' 'amd64,sparc,armel' '1' 'stable' 'Multi-Arch: same' +buildsimplenativepackage 'libc6-i386' 'amd64' '1' 'stable' 'Conflicts: libc6:sparc' + +setupaptarchive + +testsuccess aptget install 'libc6:amd64' 'libc6:sparc' -y +testdpkginstalled 'libc6:amd64' 'libc6:sparc' +testdpkgnotinstalled 'libc6-i386' 'libc6:armel' + +testsuccess aptget install libc6-i386 -y +testdpkginstalled 'libc6:amd64' 'libc6-i386' +testdpkgnotinstalled 'libc6:sparc' 'libc6:armel' + +testsuccess aptget install libc6:armel -y +testdpkginstalled 'libc6:amd64' 'libc6:armel' 'libc6-i386' +testdpkgnotinstalled 'libc6:sparc' + +testsuccess aptget install libc6:sparc -y +testdpkginstalled 'libc6:amd64' 'libc6:armel' 'libc6:sparc' +testdpkgnotinstalled 'libc6-i386' + +testsuccess aptget purge 'libc6:*' 'libc6-i386' -y +testdpkgnotinstalled 'libc6:amd64' 'libc6:armel' 'libc6:sparc' 'libc6-i386' + +# check that (the actually simpler) single arch is fine, too +configarchitecture 'amd64' +testfailure aptget install libc6:sparc -s +testsuccess aptget install libc6 libc6-i386 -y diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index 67ca0ba27..6671dd75a 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -67,6 +67,8 @@ testrun() { msgtest "\tdsc file is present"; testsuccess --nomsg test -f testpkg_1.0.dsc msgtest "\tdirectory is present"; testsuccess --nomsg test -d testpkg-1.0 rm -rf testpkg-1.0 + testequal "$(aptcache show testpkg -o Acquire::Languages=none) +" aptcache dumpavail } echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop index 4978fe1e8..a2c411aaf 100755 --- a/test/integration/test-conflicts-loop +++ b/test/integration/test-conflicts-loop @@ -20,11 +20,13 @@ Building dependency tree... The following packages will be upgraded: openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Remv openjdk-6-jre [6b16-1.8-0ubuntu1] +Remv openjdk-6-jre-headless [6b16-1.8-0ubuntu1] Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1] -Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Conf openjdk-6-jre (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) +Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386]) Conf openjdk-6-jre-headless (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])' aptget dist-upgrade -s -o APT::Immediate-Configure-All=true + +testsuccess aptget dist-upgrade -s -o Debug::pkgPackageManager=1 diff --git a/test/integration/test-essential-force-loopbreak b/test/integration/test-essential-force-loopbreak new file mode 100755 index 000000000..ac8fc6d28 --- /dev/null +++ b/test/integration/test-essential-force-loopbreak @@ -0,0 +1,51 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'native' + +insertinstalledpackage 'sysvinit' 'native' '1' 'Essential: yes' + +buildsimplenativepackage 'sysvinit' 'native' '2' 'sid' 'Pre-Depends: sysvinit-core | systemd-sysv +Essential: yes' +buildsimplenativepackage 'sysvinit-core' 'native' '2' 'sid' + +buildsimplenativepackage 'systemd-sysv' 'native' '2~conflict' 'sid-conflict' 'Conflicts: sysvinit (<< 2) +Breaks: sysvinit-core' + +buildsimplenativepackage 'systemd-sysv' 'native' '2~break' 'sid-break' 'Breaks: sysvinit (<< 2), sysvinit-core' + +setupaptarchive + +cp -a rootdir/var/lib/dpkg/status dpkg.status.backup + +testforcebreak() { + cp -a dpkg.status.backup rootdir/var/lib/dpkg/status + rm -f rootdir/var/lib/apt/extended_states + testequal "Reading package lists... +Building dependency tree... +The following extra packages will be installed: + sysvinit +The following NEW packages will be installed: + systemd-sysv +The following packages will be upgraded: + sysvinit +1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +E: This installation run will require temporarily removing the essential package sysvinit:$(getarchitecture 'native') 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. +E: Internal Error, Could not early remove sysvinit:$(dpkg --print-architecture) (2)" aptget install systemd-sysv -t "$1" -s + # ensure that really nothing happens + testfailure aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1 + testdpkginstalled 'sysvinit' + testdpkgnotinstalled 'systemd-sysv' + + # with enough force however … + cp -a dpkg.status.backup rootdir/var/lib/dpkg/status + testsuccess aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1 -o APT::Force-LoopBreak=1 + testdpkginstalled 'sysvinit' 'systemd-sysv' +} + +testforcebreak 'sid-conflict' +testforcebreak 'sid-break' diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol new file mode 100755 index 000000000..09230d383 --- /dev/null +++ b/test/integration/test-external-dependency-solver-protocol @@ -0,0 +1,65 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertinstalledpackage 'cool' 'all' '1' +insertinstalledpackage 'stuff' 'all' '1' + +insertpackage 'unstable' 'cool' 'all' '2' 'Multi-Arch: foreign' +insertpackage 'unstable' 'stuff' 'all' '2' 'Multi-Arch: foreign' +insertpackage 'unstable' 'coolstuff' 'i386,amd64' '2' 'Depends: cool, stuff' +insertpackage 'unstable' 'awesome' 'all' '2' 'Multi-Arch: foreign' +insertpackage 'unstable' 'awesomecoolstuff' 'i386' '2' 'Depends: coolstuff, awesome' + +insertpackage 'experimental' 'cool' 'all' '3' 'Multi-Arch: foreign' +insertpackage 'experimental' 'stuff' 'all' '3' 'Multi-Arch: foreign' +insertpackage 'experimental' 'coolstuff' 'i386,amd64' '3' 'Depends: cool, stuff' + +setupaptarchive + +rm -f /tmp/dump.edsp +testequal 'Reading package lists... +Building dependency tree... +Execute external solver... +The solver encountered an error of type: ERR_JUST_DUMPING +The following information might help you to understand what is wrong: +I am too dumb, i can just dump! +Please use one of my friends instead! + +E: External solver failed with: I am too dumb, i can just dump!' aptget install --solver dump coolstuff -s +testsuccess test -s /tmp/dump.edsp +rm -f /tmp/dump.edsp + +#FIXME: this should be unstable, but we don't support pinning yet +testequal 'Reading package lists... +Building dependency tree... +Execute external solver... +The following NEW packages will be installed: + coolstuff +0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. +Inst coolstuff (3 experimental [amd64]) +Conf coolstuff (3 experimental [amd64])' aptget install --solver apt coolstuff -s + +testsuccess aptget install awesomecoolstuff:i386 -s +testsuccess aptget install --solver apt awesomecoolstuff:i386 -s + +rm -f /tmp/dump.edsp +testfailure aptget install --solver dump awesomecoolstuff:i386 -s +testsuccess test -s /tmp/dump.edsp + +configarchitecture 'armel' +msgtest 'Test direct calling is okay for' 'apt-internal-solver' +cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true +if [ "$(tail -n2 solver.result | head -n1 )" = "Message: Done" ]; then + msgpass +else + cat solver.result + msgfail +fi +rm -f /tmp/dump.edsp + +testfailure aptget install --solver apt awesomecoolstuff:i386 -s diff --git a/test/integration/test-http-pipeline-messup b/test/integration/test-http-pipeline-messup new file mode 100755 index 000000000..9c59e1825 --- /dev/null +++ b/test/integration/test-http-pipeline-messup @@ -0,0 +1,43 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'pkga' 'all' '1.0' 'stable' +buildsimplenativepackage 'pkgb' 'all' '1.0' 'stable' +buildsimplenativepackage 'pkgc' 'all' '1.0' 'stable' +buildsimplenativepackage 'pkgd' 'all' '1.0' 'stable' + +setupaptarchive --no-update + +# simulate (and be a predictable) pipeline mess-up by the server/proxy +changetowebserver \ + -o 'aptwebserver::overwrite::.*pkga.*::filename=/pool/pkgd_1.0_all.deb' \ + -o 'aptwebserver::overwrite::.*pkgc.*::filename=/pool/pkgb_1.0_all.deb' \ + -o 'aptwebserver::overwrite::.*pkgb.*::filename=/pool/pkgc_1.0_all.deb' \ + -o 'aptwebserver::overwrite::.*pkgd.*::filename=/pool/pkga_1.0_all.deb' + +testsuccess aptget update -o Debug::Acquire::http=1 -o Debug::pkgAcquire::Worker=1 + +# messup is bigger than pipeline: checks if fixup isn't trying to hard +testfailure aptget download pkga pkgb pkgc pkgd "$@" -o Acquire::http::Pipeline-Depth=2 +testfailure test -f pkga_1.0_all.deb + +# ensure that pipeling is enabled for rest of this test +echo 'Acquire::http::Pipeline-Depth 10;' > rootdir/etc/apt/apt.conf.d/99enable-pipeline + +# the output is a bit strange: it looks like it has downloaded pkga 4 times +testsuccess aptget download pkga pkgb pkgc pkgd -o Debug::Acquire::http=1 -o Debug::pkgAcquire::Worker=1 +for pkg in 'pkga' 'pkgb' 'pkgc' 'pkgd'; do + testsuccess test -f ${pkg}_1.0_all.deb + testsuccess cmp incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb + rm -f ${pkg}_1.0_all.deb +done + +# while hashes will pass (as none are available), sizes will not match, so failure +# checks that no hashes means that pipeline depth is ignored as we can't fixup +testfailure aptget download pkga pkgb pkgc pkgd "$@" --allow-unauthenticated -o Acquire::ForceHash=ROT26 diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove index c51caa758..22c36890b 100755 --- a/test/integration/test-kernel-helper-autoremove +++ b/test/integration/test-kernel-helper-autoremove @@ -9,7 +9,7 @@ configarchitecture 'amd64' # the executed script would use the installed apt-config, # which is outside of our control msgtest 'Check that the installed apt-config supports' '--no-empty' -if apt-config dump --no-empty >/dev/null 2>&1; then +if /usr/bin/apt-config dump --no-empty >/dev/null 2>&1; then msgpass else msgskip diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index afe1ad443..74749d6ab 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -13,12 +13,6 @@ changetowebserver PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')" -echo '#!/bin/sh -touch merge-was-used -/usr/bin/diffindex-rred "$@"' > extrred -chmod +x extrred -echo 'Dir::Bin::rred "./extrred";' > rootdir/etc/apt/apt.conf.d/99rred - wasmergeused() { msgtest 'Test for successful execution of' "$*" local OUTPUT=$(mktemp) diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum new file mode 100755 index 000000000..8c9c9c767 --- /dev/null +++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum @@ -0,0 +1,262 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'native' + +cat > aptarchive/Sources <<EOF +Package: pkg-md5-ok +Binary: pkg-md5-ok +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-md5-ok_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-md5-ok_1.0.tar.gz + +Package: pkg-sha256-ok +Binary: pkg-sha256-ok +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-sha256-ok_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-sha256-ok_1.0.tar.gz +Checksums-Sha1: + 324f464e6151a92cf57b26ef95dcfcf2059a8c44 3 pkg-sha256-ok_1.0.dsc + 680254bad1d7ca0d65ec46aaa315d363abf6a50a 3 pkg-sha256-ok_1.0.tar.gz +Checksums-Sha256: + 943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a 3 pkg-sha256-ok_1.0.dsc + 90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb 3 pkg-sha256-ok_1.0.tar.gz + +Package: pkg-sha256-bad +Binary: pkg-sha256-bad +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-sha256-bad_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-sha256-bad_1.0.tar.gz +Checksums-Sha1: + 324f464e6151a92cf57b26ef95dcfcf2059a8c44 3 pkg-sha256-bad_1.0.dsc + 680254bad1d7ca0d65ec46aaa315d363abf6a50a 3 pkg-sha256-bad_1.0.tar.gz +Checksums-Sha256: + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 3 pkg-sha256-bad_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 3 pkg-sha256-bad_1.0.tar.gz + +Package: pkg-no-md5 +Binary: pkg-no-md5 +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Checksums-Sha1: + 324f464e6151a92cf57b26ef95dcfcf2059a8c44 3 pkg-no-md5_1.0.dsc + 680254bad1d7ca0d65ec46aaa315d363abf6a50a 3 pkg-no-md5_1.0.tar.gz +Checksums-Sha256: + 943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a 3 pkg-no-md5_1.0.dsc + 90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb 3 pkg-no-md5_1.0.tar.gz + +Package: pkg-mixed-ok +Binary: pkg-mixed-ok +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Checksums-Sha1: + 680254bad1d7ca0d65ec46aaa315d363abf6a50a 3 pkg-mixed-ok_1.0.tar.gz +Checksums-Sha256: + 943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a 3 pkg-mixed-ok_1.0.dsc + +Package: pkg-mixed-sha1-bad +Binary: pkg-mixed-sha1-bad +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Checksums-Sha1: + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 3 pkg-mixed-sha1-bad_1.0.dsc +Checksums-Sha256: + 90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb 3 pkg-mixed-sha1-bad_1.0.tar.gz + +Package: pkg-mixed-sha2-bad +Binary: pkg-mixed-sha2-bad +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Checksums-Sha1: + 324f464e6151a92cf57b26ef95dcfcf2059a8c44 3 pkg-mixed-sha2-bad_1.0.dsc +Checksums-Sha256: + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 3 pkg-mixed-sha2-bad_1.0.tar.gz + +Package: pkg-md5-disagree +Binary: pkg-md5-disagree +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-md5-disagree_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-md5-disagree_1.0.tar.gz + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 3 pkg-md5-disagree_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 3 pkg-md5-disagree_1.0.tar.gz + +Package: pkg-md5-agree +Binary: pkg-md5-agree +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-md5-agree_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-md5-agree_1.0.tar.gz + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-md5-agree_1.0.tar.gz + 9604ba9427a280db542279d9ed78400b 3 pkg-md5-agree_1.0.dsc + +Package: pkg-sha256-disagree +Binary: pkg-sha256-disagree +Version: 1.0 +Maintainer: Joe Sixpack <joe@example.org> +Architecture: all +Files: + 9604ba9427a280db542279d9ed78400b 3 pkg-sha256-disagree_1.0.dsc + db5570bf61464b46e2bde31ed61a7dc6 3 pkg-sha256-disagree_1.0.tar.gz +Checksums-Sha1: + 324f464e6151a92cf57b26ef95dcfcf2059a8c44 3 pkg-sha256-disagree_1.0.dsc + 680254bad1d7ca0d65ec46aaa315d363abf6a50a 3 pkg-sha256-disagree_1.0.tar.gz +Checksums-Sha256: + 943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a 3 pkg-sha256-disagree_1.0.dsc + 90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb 3 pkg-sha256-disagree_1.0.tar.gz + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 3 pkg-sha256-disagree_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 3 pkg-sha256-disagree_1.0.tar.gz +EOF + +# create fetchable files +for x in 'pkg-md5-ok' 'pkg-sha256-ok' 'pkg-sha256-bad' 'pkg-no-md5' \ + 'pkg-mixed-ok' 'pkg-mixed-sha1-bad' 'pkg-mixed-sha2-bad' \ + 'pkg-md5-agree' 'pkg-md5-disagree' 'pkg-sha256-disagree'; do + echo -n 'dsc' > aptarchive/${x}_1.0.dsc + echo -n 'tar' > aptarchive/${x}_1.0.tar.gz +done + +setupaptarchive +changetowebserver +testsuccess aptget update + +testok() { + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Need to get 6 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B] +Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B] +Download complete and in download only mode" aptget source -d "$@" + msgtest 'Files were successfully downloaded for' "$1" + testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz +} + +testkeep() { + echo -n 'dsc' > ${1}_1.0.dsc + echo -n 'tar' > ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Skipping already downloaded file '${1}_1.0.dsc' +Skipping already downloaded file '${1}_1.0.tar.gz' +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d "$@" + msgtest 'Files already downloaded are kept for' "$1" + testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz +} + +testmismatch() { + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Need to get 6 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B] +Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B] +E: Failed to fetch http://localhost:8080/${1}_1.0.dsc Hash Sum mismatch + +E: Failed to fetch http://localhost:8080/${1}_1.0.tar.gz Hash Sum mismatch + +E: Failed to fetch some archives." aptget source -d "$@" + msgtest 'Files were not download as they have hashsum mismatches for' "$1" + testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz + + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Skipping download of file 'pkg-sha256-bad_1.0.dsc' as requested hashsum is not available for authentication +Skipping download of file 'pkg-sha256-bad_1.0.tar.gz' as requested hashsum is not available for authentication +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d "$@" -o Acquire::ForceHash=ROT26 + msgtest 'Files were not download as hash is unavailable for' "$1" + testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz + + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Need to get 6 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B] +Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B] +Download complete and in download only mode" aptget source --allow-unauthenticated -d "$@" -o Acquire::ForceHash=ROT26 + msgtest 'Files were downloaded unauthenticated as user allowed it' "$1" + testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz +} + +testok pkg-md5-ok +testkeep pkg-md5-ok +testok pkg-sha256-ok +testkeep pkg-sha256-ok + +# pkg-sha256-bad has a bad SHA sum, but good MD5 sum. If apt is +# checking the best available hash (as it should), this will trigger +# a hash mismatch. +testmismatch pkg-sha256-bad +testmismatch pkg-sha256-bad +testok pkg-sha256-bad -o Acquire::ForceHash=MD5Sum + +# not having MD5 sum doesn't mean the file doesn't exist at all … +testok pkg-no-md5 +testok pkg-no-md5 -o Acquire::ForceHash=SHA256 +testequal "Reading package lists... +Building dependency tree... +Skipping download of file 'pkg-no-md5_1.0.dsc' as requested hashsum is not available for authentication +Skipping download of file 'pkg-no-md5_1.0.tar.gz' as requested hashsum is not available for authentication +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d pkg-no-md5 -o Acquire::ForceHash=MD5Sum +msgtest 'Files were not download as MD5 is not available for this package' 'pkg-no-md5' +testfailure --nomsg test -e pkg-no-md5_1.0.dsc -a -e pkg-no-md5_1.0.tar.gz + +# deal with cases in which we haven't for all files the same checksum type +# mostly pathologic as this shouldn't happen, but just to be sure +testok pkg-mixed-ok +testequal 'Reading package lists... +Building dependency tree... +Need to get 6 B of source archives. +Get:1 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (tar) [3 B] +Get:2 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (dsc) [3 B] +E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc Hash Sum mismatch + +E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha1-bad +msgtest 'Only tar file is downloaded as the dsc has hashsum mismatch' 'pkg-mixed-sha1-bad' +testsuccess --nomsg test ! -e pkg-mixed-sha1-bad_1.0.dsc -a -e pkg-mixed-sha1-bad_1.0.tar.gz +testequal 'Reading package lists... +Building dependency tree... +Need to get 6 B of source archives. +Get:1 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (tar) [3 B] +Get:2 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (dsc) [3 B] +E: Failed to fetch http://localhost:8080/pkg-mixed-sha2-bad_1.0.tar.gz Hash Sum mismatch + +E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha2-bad +msgtest 'Only dsc file is downloaded as the tar has hashsum mismatch' 'pkg-mixed-sha2-bad' +testsuccess --nomsg test -e pkg-mixed-sha2-bad_1.0.dsc -a ! -e pkg-mixed-sha2-bad_1.0.tar.gz + +# it gets even more pathologic: multiple entries for one file, some even disagreeing! +testok pkg-md5-agree +testequal 'Reading package lists... +Building dependency tree... +E: Error parsing checksum in Files of source package pkg-md5-disagree' aptget source -d pkg-md5-disagree +testequal 'Reading package lists... +Building dependency tree... +E: Error parsing checksum in Checksums-SHA256 of source package pkg-sha256-disagree' aptget source -d pkg-sha256-disagree diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall index 7112d2b45..8e50843f3 100755 --- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@ -22,7 +22,7 @@ Config-Item: Acquire::http::DependOnSTDIN=0 600 Acquire URI URI: http://localhost:8080/holygrail Filename: knights-talking -' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail +' | runapt ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail testfileequal knights-talking 'ni ni ni' ensure_n_canary_strings_in_dir() { diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile index 8dc014b98..4633b78ce 100644 --- a/test/interactive-helper/makefile +++ b/test/interactive-helper/makefile @@ -39,7 +39,7 @@ include $(PROGRAM_H) #SOURCE = rpmver.cc #include $(PROGRAM_H) -# Program for testing udevcdrom +# very simple webserver for APT testing PROGRAM=aptwebserver SLIBS = -lapt-pkg -lpthread LIB_MAKES = apt-pkg/makefile diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index 643c02297..cdf7ea479 100644 --- a/test/libapt/fileutl_test.cc +++ b/test/libapt/fileutl_test.cc @@ -224,3 +224,61 @@ TEST(FileUtlTest, GetTempDir) if (old_tmpdir.empty() == false) setenv("TMPDIR", old_tmpdir.c_str(), 1); } +TEST(FileUtlTest, Popen) +{ + FileFd Fd; + pid_t Child; + char buf[1024]; + std::string s; + unsigned long long n = 0; + std::vector<std::string> OpenFds; + + // count Fds to ensure we don't have a resource leak + if(FileExists("/proc/self/fd")) + OpenFds = Glob("/proc/self/fd/*"); + + // output something + const char* Args[10] = {"/bin/echo", "meepmeep", NULL}; + bool res = Popen(Args, Fd, Child, FileFd::ReadOnly); + Fd.Read(buf, sizeof(buf)-1, &n); + buf[n] = 0; + EXPECT_NE(n, 0); + EXPECT_EQ(res, true); + EXPECT_STREQ(buf, "meepmeep\n"); + + // wait for the child to exit and cleanup + ExecWait(Child, "PopenRead"); + Fd.Close(); + + // ensure that after a close all is good again + if(FileExists("/proc/self/fd")) + EXPECT_EQ(Glob("/proc/self/fd/*").size(), OpenFds.size()); + + + // ReadWrite is not supported + res = Popen(Args, Fd, Child, FileFd::ReadWrite); + EXPECT_EQ(res, false); + _error->Discard(); + + // write something + Args[0] = "/bin/bash"; + Args[1] = "-c"; + Args[2] = "read"; + Args[3] = NULL; + res = Popen(Args, Fd, Child, FileFd::WriteOnly); + s = "\n"; + Fd.Write(s.c_str(), s.size()); + Fd.Close(); + ExecWait(Child, "PopenWrite"); +} +TEST(FileUtlTest, flAbsPath) +{ + std::string cwd = SafeGetCWD(); + int res = chdir("/bin/"); + EXPECT_EQ(res, 0); + std::string p = flAbsPath("ls"); + EXPECT_EQ(p, "/bin/ls"); + + res = chdir(cwd.c_str()); + EXPECT_EQ(res, 0); +} diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc index c06d85e03..2159996ff 100644 --- a/test/libapt/hashsums_test.cc +++ b/test/libapt/hashsums_test.cc @@ -1,5 +1,6 @@ #include <config.h> +#include <apt-pkg/configuration.h> #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/sha2.h> @@ -166,20 +167,26 @@ TEST(HashSumsTest, FileBased) { Hashes hashes; hashes.AddFD(fd.Fd()); - EXPECT_EQ(md5.Value(), hashes.MD5.Result().Value()); - EXPECT_EQ(sha1.Value(), hashes.SHA1.Result().Value()); - EXPECT_EQ(sha256.Value(), hashes.SHA256.Result().Value()); - EXPECT_EQ(sha512.Value(), hashes.SHA512.Result().Value()); + HashStringList list = hashes.GetHashStringList(); + EXPECT_FALSE(list.empty()); + EXPECT_EQ(4, list.size()); + EXPECT_EQ(md5.Value(), list.find("MD5Sum")->HashValue()); + EXPECT_EQ(sha1.Value(), list.find("SHA1")->HashValue()); + EXPECT_EQ(sha256.Value(), list.find("SHA256")->HashValue()); + EXPECT_EQ(sha512.Value(), list.find("SHA512")->HashValue()); } unsigned long sz = fd.FileSize(); fd.Seek(0); { Hashes hashes; hashes.AddFD(fd.Fd(), sz); - EXPECT_EQ(md5.Value(), hashes.MD5.Result().Value()); - EXPECT_EQ(sha1.Value(), hashes.SHA1.Result().Value()); - EXPECT_EQ(sha256.Value(), hashes.SHA256.Result().Value()); - EXPECT_EQ(sha512.Value(), hashes.SHA512.Result().Value()); + HashStringList list = hashes.GetHashStringList(); + EXPECT_FALSE(list.empty()); + EXPECT_EQ(4, list.size()); + EXPECT_EQ(md5.Value(), list.find("MD5Sum")->HashValue()); + EXPECT_EQ(sha1.Value(), list.find("SHA1")->HashValue()); + EXPECT_EQ(sha256.Value(), list.find("SHA256")->HashValue()); + EXPECT_EQ(sha512.Value(), list.find("SHA512")->HashValue()); } fd.Seek(0); { @@ -207,16 +214,118 @@ TEST(HashSumsTest, FileBased) } fd.Close(); - { - HashString sha2("SHA256", sha256.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } - { - HashString sha2("SHA512", sha512.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } - { - HashString sha2("SHA256:" + sha256.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } + HashString sha2file("SHA512", sha512.Value()); + EXPECT_TRUE(sha2file.VerifyFile(__FILE__)); + HashString sha2wrong("SHA512", "00000000000"); + EXPECT_FALSE(sha2wrong.VerifyFile(__FILE__)); + EXPECT_EQ(sha2file, sha2file); + EXPECT_TRUE(sha2file == sha2file); + EXPECT_NE(sha2file, sha2wrong); + EXPECT_TRUE(sha2file != sha2wrong); + + HashString sha2big("SHA256", sha256.Value()); + EXPECT_TRUE(sha2big.VerifyFile(__FILE__)); + HashString sha2small("sha256:" + sha256.Value()); + EXPECT_TRUE(sha2small.VerifyFile(__FILE__)); + EXPECT_EQ(sha2big, sha2small); + EXPECT_TRUE(sha2big == sha2small); + EXPECT_FALSE(sha2big != sha2small); + + HashStringList hashes; + EXPECT_TRUE(hashes.empty()); + EXPECT_TRUE(hashes.push_back(sha2file)); + EXPECT_FALSE(hashes.empty()); + EXPECT_EQ(1, hashes.size()); + + HashStringList wrong; + EXPECT_TRUE(wrong.push_back(sha2wrong)); + EXPECT_NE(wrong, hashes); + EXPECT_FALSE(wrong == hashes); + EXPECT_TRUE(wrong != hashes); + + HashStringList similar; + EXPECT_TRUE(similar.push_back(sha2big)); + EXPECT_NE(similar, hashes); + EXPECT_FALSE(similar == hashes); + EXPECT_TRUE(similar != hashes); + + EXPECT_TRUE(hashes.push_back(sha2big)); + EXPECT_EQ(2, hashes.size()); + EXPECT_TRUE(hashes.push_back(sha2small)); + EXPECT_EQ(2, hashes.size()); + EXPECT_FALSE(hashes.push_back(sha2wrong)); + EXPECT_EQ(2, hashes.size()); + EXPECT_TRUE(hashes.VerifyFile(__FILE__)); + + EXPECT_EQ(similar, hashes); + EXPECT_TRUE(similar == hashes); + EXPECT_FALSE(similar != hashes); + similar.clear(); + EXPECT_TRUE(similar.empty()); + EXPECT_EQ(0, similar.size()); + EXPECT_NE(similar, hashes); + EXPECT_FALSE(similar == hashes); + EXPECT_TRUE(similar != hashes); +} +TEST(HashSumsTest, HashStringList) +{ + _config->Clear("Acquire::ForceHash"); + + HashStringList list; + EXPECT_TRUE(list.empty()); + EXPECT_FALSE(list.usable()); + EXPECT_EQ(0, list.size()); + EXPECT_EQ(NULL, list.find(NULL)); + EXPECT_EQ(NULL, list.find("")); + EXPECT_EQ(NULL, list.find("MD5Sum")); + + HashStringList list2; + EXPECT_FALSE(list == list2); + EXPECT_TRUE(list != list2); + + Hashes hashes; + hashes.Add("The quick brown fox jumps over the lazy dog"); + list = hashes.GetHashStringList(); + EXPECT_FALSE(list.empty()); + EXPECT_TRUE(list.usable()); + EXPECT_EQ(4, list.size()); + EXPECT_TRUE(NULL != list.find(NULL)); + EXPECT_TRUE(NULL != list.find("")); + EXPECT_TRUE(NULL != list.find("MD5Sum")); + EXPECT_TRUE(NULL == list.find("ROT26")); + + _config->Set("Acquire::ForceHash", "MD5Sum"); + EXPECT_FALSE(list.empty()); + EXPECT_TRUE(list.usable()); + EXPECT_EQ(4, list.size()); + EXPECT_TRUE(NULL != list.find(NULL)); + EXPECT_TRUE(NULL != list.find("")); + EXPECT_TRUE(NULL != list.find("MD5Sum")); + EXPECT_TRUE(NULL == list.find("ROT26")); + + _config->Set("Acquire::ForceHash", "ROT26"); + EXPECT_FALSE(list.empty()); + EXPECT_FALSE(list.usable()); + EXPECT_EQ(4, list.size()); + EXPECT_TRUE(NULL == list.find(NULL)); + EXPECT_TRUE(NULL == list.find("")); + EXPECT_TRUE(NULL != list.find("MD5Sum")); + EXPECT_TRUE(NULL == list.find("ROT26")); + + _config->Clear("Acquire::ForceHash"); + + list2.push_back(*list.find("MD5Sum")); + EXPECT_TRUE(list == list2); + EXPECT_FALSE(list != list2); + + // introduce a mismatch to the list + list2.push_back(HashString("SHA1", "cacecbd74968bc90ea3342767e6b94f46ddbcafc")); + EXPECT_FALSE(list == list2); + EXPECT_TRUE(list != list2); + + _config->Set("Acquire::ForceHash", "MD5Sum"); + EXPECT_TRUE(list == list2); + EXPECT_FALSE(list != list2); + + _config->Clear("Acquire::ForceHash"); } diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index 1bac75b55..df618ea16 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -7,6 +7,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sstream> #include <gtest/gtest.h> @@ -34,3 +35,181 @@ TEST(TagFileTest,SingleField) // There is only one section in this tag file EXPECT_FALSE(tfile.Step(section)); } + +TEST(TagFileTest,MultipleSections) +{ + FileFd fd; + createTemporaryFile("bigsection", fd, NULL, "Package: pkgA\n" + "Version: 1\n" + "Size: 100\n" + "Description: aaa\n" + " aaa\n" + "\n" + "Package: pkgB\n" + "Version: 1\n" + "Flag: no\n" + "Description: bbb\n" + "\n" + "Package: pkgC\n" + "Version: 2\n" + "Flag: yes\n" + "Description:\n" + " ccc\n" + ); + + pkgTagFile tfile(&fd); + pkgTagSection section; + EXPECT_FALSE(section.Exists("Version")); + + EXPECT_TRUE(tfile.Step(section)); + EXPECT_EQ(4, section.Count()); + EXPECT_TRUE(section.Exists("Version")); + EXPECT_TRUE(section.Exists("Package")); + EXPECT_TRUE(section.Exists("Size")); + EXPECT_FALSE(section.Exists("Flag")); + EXPECT_TRUE(section.Exists("Description")); + EXPECT_EQ("pkgA", section.FindS("Package")); + EXPECT_EQ("1", section.FindS("Version")); + EXPECT_EQ(1, section.FindULL("Version")); + EXPECT_EQ(100, section.FindULL("Size")); + unsigned long Flags = 1; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(1, Flags); + Flags = 0; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(0, Flags); + EXPECT_EQ("aaa\n aaa", section.FindS("Description")); + + + EXPECT_TRUE(tfile.Step(section)); + EXPECT_EQ(4, section.Count()); + EXPECT_TRUE(section.Exists("Version")); + EXPECT_TRUE(section.Exists("Package")); + EXPECT_FALSE(section.Exists("Size")); + EXPECT_TRUE(section.Exists("Flag")); + EXPECT_TRUE(section.Exists("Description")); + EXPECT_EQ("pkgB", section.FindS("Package")); + EXPECT_EQ("1", section.FindS("Version")); + EXPECT_EQ(1, section.FindULL("Version")); + EXPECT_EQ(0, section.FindULL("Size")); + Flags = 1; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(0, Flags); + Flags = 0; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(0, Flags); + EXPECT_EQ("bbb", section.FindS("Description")); + + EXPECT_TRUE(tfile.Step(section)); + EXPECT_EQ(4, section.Count()); + EXPECT_TRUE(section.Exists("Version")); + EXPECT_TRUE(section.Exists("Package")); + EXPECT_FALSE(section.Exists("Size")); + EXPECT_TRUE(section.Exists("Flag")); + EXPECT_TRUE(section.Exists("Description")); + EXPECT_EQ("pkgC", section.FindS("Package")); + EXPECT_EQ("2", section.FindS("Version")); + EXPECT_EQ(2, section.FindULL("Version")); + Flags = 0; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(1, Flags); + Flags = 1; + EXPECT_TRUE(section.FindFlag("Flag", Flags, 1)); + EXPECT_EQ(1, Flags); + EXPECT_EQ("ccc", section.FindS("Description")); + + // There is no section left in this tag file + EXPECT_FALSE(tfile.Step(section)); +} + +TEST(TagFileTest,BigSection) +{ + size_t const count = 500; + std::stringstream content; + for (size_t i = 0; i < count; ++i) + content << "Field-" << i << ": " << (2000 + i) << std::endl; + + FileFd fd; + createTemporaryFile("bigsection", fd, NULL, content.str().c_str()); + + pkgTagFile tfile(&fd); + pkgTagSection section; + EXPECT_TRUE(tfile.Step(section)); + + EXPECT_EQ(count, section.Count()); + for (size_t i = 0; i < count; ++i) + { + std::stringstream name; + name << "Field-" << i; + EXPECT_TRUE(section.Exists(name.str().c_str())) << name.str() << " does not exist"; + EXPECT_EQ((2000 + i), section.FindULL(name.str().c_str())); + } + + // There is only one section in this tag file + EXPECT_FALSE(tfile.Step(section)); +} + +TEST(TagFileTest, PickedUpFromPreviousCall) +{ + size_t const count = 500; + std::stringstream contentstream; + for (size_t i = 0; i < count; ++i) + contentstream << "Field-" << i << ": " << (2000 + i) << std::endl; + contentstream << std::endl << std::endl; + std::string content = contentstream.str(); + + pkgTagSection section; + EXPECT_FALSE(section.Scan(content.c_str(), content.size()/2)); + EXPECT_NE(0, section.Count()); + EXPECT_NE(count, section.Count()); + EXPECT_TRUE(section.Scan(content.c_str(), content.size(), false)); + EXPECT_EQ(count, section.Count()); + + for (size_t i = 0; i < count; ++i) + { + std::stringstream name; + name << "Field-" << i; + EXPECT_TRUE(section.Exists(name.str().c_str())) << name.str() << " does not exist"; + EXPECT_EQ((2000 + i), section.FindULL(name.str().c_str())); + } +} + +TEST(TagFileTest, SpacesEverywhere) +{ + std::string content = + "Package: pkgA\n" + "Package: pkgB\n" + "NoSpaces:yes\n" + "TagSpaces\t :yes\n" + "ValueSpaces: \tyes\n" + "BothSpaces \t:\t yes\n" + "TrailingSpaces: yes\t \n" + "Naming Space: yes\n" + "Naming Spaces: yes\n" + "Package : pkgC \n" + "Multi-Colon::yes:\n" + "\n\n"; + + pkgTagSection section; + EXPECT_TRUE(section.Scan(content.c_str(), content.size())); + EXPECT_TRUE(section.Exists("Package")); + EXPECT_TRUE(section.Exists("NoSpaces")); + EXPECT_TRUE(section.Exists("TagSpaces")); + EXPECT_TRUE(section.Exists("ValueSpaces")); + EXPECT_TRUE(section.Exists("BothSpaces")); + EXPECT_TRUE(section.Exists("TrailingSpaces")); + EXPECT_TRUE(section.Exists("Naming Space")); + EXPECT_TRUE(section.Exists("Naming Spaces")); + EXPECT_TRUE(section.Exists("Multi-Colon")); + EXPECT_EQ("pkgC", section.FindS("Package")); + EXPECT_EQ("yes", section.FindS("NoSpaces")); + EXPECT_EQ("yes", section.FindS("TagSpaces")); + EXPECT_EQ("yes", section.FindS("ValueSpaces")); + EXPECT_EQ("yes", section.FindS("BothSpaces")); + EXPECT_EQ("yes", section.FindS("TrailingSpaces")); + EXPECT_EQ("yes", section.FindS("Naming Space")); + EXPECT_EQ("yes", section.FindS("Naming Spaces")); + EXPECT_EQ(":yes:", section.FindS("Multi-Colon")); + // overridden values are still present, but not really accessible + EXPECT_EQ(11, section.Count()); +} |