diff options
150 files changed, 29692 insertions, 13600 deletions
@@ -26,7 +26,7 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean # The startup target builds the necessary configure scripts. It should # be used after a CVS checkout. -CONVERTED=environment.mak include/config.h include/apti18n.h makefile +CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile include buildlib/configure.mak $(BUILDDIR)/include/config.h: buildlib/config.h.in $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index c6a0e80e6..718e1ab98 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress) return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { - Progress.OverallProgress(1,1,1,_("Reading file list")); + Progress.OverallProgress(1,1,1,_("Reading file listing")); return true; } diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index 7ae93c9b0..898ede31b 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) case Item::CharDevice: case Item::BlockDevice: case Item::Directory: + { + struct stat Buf; + // check if the dir is already there, if so return true + if (stat(Itm.Name,&Buf) == 0) + { + if(S_ISDIR(Buf.st_mode)) + return true; + // something else is there already, return false + return false; + } + // nothing here, create the dir + if(mkdir(Itm.Name,Itm.Mode) < 0) + return false; + return true; + break; + } case Item::FIFO: break; } diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index e0e0611f0..966126255 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -24,6 +24,8 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/tagfile.h> #include <apti18n.h> @@ -31,6 +33,7 @@ #include <unistd.h> #include <errno.h> #include <string> +#include <sstream> #include <stdio.h> /*}}}*/ @@ -100,7 +103,8 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string, { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); - if (Complete == false && FileName == DestFile) + // we only inform the Log class if it was actually not a local thing + if (Complete == false && !Local && FileName == DestFile) { if (Owner->Log != 0) Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str())); @@ -131,14 +135,430 @@ void pkgAcquire::Item::Rename(string From,string To) } /*}}}*/ +// AcqDiffIndex::AcqDiffIndex - Constructor +// --------------------------------------------------------------------- +/* Get the DiffIndex file first and see if there are patches availabe + * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the + * patches. If anything goes wrong in that process, it will fall back to + * the original packages file + */ +pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc, + string ExpectedMD5) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), Description(URIDesc) +{ + + Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); + + Desc.Description = URIDesc + "/DiffIndex"; + Desc.Owner = this; + Desc.ShortDesc = ShortDesc; + Desc.URI = URI + ".diff/Index"; + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI) + string(".DiffIndex"); + + if(Debug) + std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl; + + // look for the current package file + CurrentPackagesFile = _config->FindDir("Dir::State::lists"); + CurrentPackagesFile += URItoFileName(RealURI); + + // FIXME: this file:/ check is a hack to prevent fetching + // from local sources. this is really silly, and + // should be fixed cleanly as soon as possible + if(!FileExists(CurrentPackagesFile) || + Desc.URI.substr(0,strlen("file:/")) == "file:/") + { + // we don't have a pkg file or we don't want to queue + if(Debug) + std::clog << "No index file, local or canceld by user" << std::endl; + Failed("", NULL); + return; + } + + if(Debug) + std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " + << CurrentPackagesFile << std::endl; + + QueueURI(Desc); + +} + +// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +/* The only header we use is the last-modified header. */ +string pkgAcqDiffIndex::Custom600Headers() +{ + string Final = _config->FindDir("Dir::State::lists"); + Final += URItoFileName(RealURI) + string(".IndexDiff"); + + if(Debug) + std::clog << "Custom600Header-IMS: " << Final << std::endl; + + struct stat Buf; + if (stat(Final.c_str(),&Buf) != 0) + return "\nIndex-File: true"; + + return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); +} + + +bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile + << std::endl; + + pkgTagSection Tags; + string ServerSha1; + vector<DiffInfo> available_patches; + + FileFd Fd(IndexDiffFile,FileFd::ReadOnly); + pkgTagFile TF(&Fd); + if (_error->PendingError() == true) + return false; + + if(TF.Step(Tags) == true) + { + string local_sha1; + bool found = false; + DiffInfo d; + string size; + + string tmp = Tags.FindS("SHA1-Current"); + std::stringstream ss(tmp); + ss >> ServerSha1; + + FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); + SHA1Summation SHA1; + SHA1.AddFD(fd.Fd(), fd.Size()); + local_sha1 = string(SHA1.Result()); + + if(local_sha1 == ServerSha1) + { + // we have the same sha1 as the server + if(Debug) + std::clog << "Package file is up-to-date" << std::endl; + // set found to true, this will queue a pkgAcqIndexDiffs with + // a empty availabe_patches + found = true; + } + else + { + if(Debug) + std::clog << "SHA1-Current: " << ServerSha1 << std::endl; + + // check the historie and see what patches we need + string history = Tags.FindS("SHA1-History"); + std::stringstream hist(history); + while(hist >> d.sha1 >> size >> d.file) + { + d.size = atoi(size.c_str()); + // read until the first match is found + if(d.sha1 == local_sha1) + found=true; + // from that point on, we probably need all diffs + if(found) + { + if(Debug) + std::clog << "Need to get diff: " << d.file << std::endl; + available_patches.push_back(d); + } + } + } + + // no information how to get the patches, bail out + if(!found) + { + if(Debug) + std::clog << "Can't find a patch in the index file" << std::endl; + // Failed will queue a big package file + Failed("", NULL); + } + else + { + // queue the diffs + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, available_patches); + Complete = false; + Status = StatDone; + Dequeue(); + return true; + } + } + + return false; +} + +void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl + << "Falling back to normal index file aquire" << std::endl; + + new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5); + + Complete = false; + Status = StatDone; + Dequeue(); +} + +void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl; + + Item::Done(Message,Size,Md5Hash,Cnf); + + string FinalFile; + FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); + + // sucess in downloading the index + // rename the index + FinalFile += string(".IndexDiff"); + if(Debug) + std::clog << "Renaming: " << DestFile << " -> " << FinalFile + << std::endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + DestFile = FinalFile; + + if(!ParseDiffIndex(DestFile)) + return Failed("", NULL); + + Complete = true; + Status = StatDone; + Dequeue(); + return; +} + + + +// AcqIndexDiffs::AcqIndexDiffs - Constructor +// --------------------------------------------------------------------- +/* The package diff is added to the queue. one object is constructed + * for each diff and the index + */ +pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc, + string ExpectedMD5, vector<DiffInfo> diffs) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), + available_patches(diffs) +{ + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI); + + Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); + + Desc.Description = URIDesc; + Desc.Owner = this; + Desc.ShortDesc = ShortDesc; + + if(available_patches.size() == 0) + { + // we are done (yeah!) + Finish(true); + } + else + { + // get the next diff + State = StateFetchDiff; + QueueNextDiff(); + } +} + + +void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl + << "Falling back to normal index file aquire" << std::endl; + new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, + ExpectedMD5); + Finish(); +} + + +// helper that cleans the item out of the fetcher queue +void pkgAcqIndexDiffs::Finish(bool allDone) +{ + // we restore the original name, this is required, otherwise + // the file will be cleaned + if(allDone) + { + DestFile = _config->FindDir("Dir::State::lists"); + DestFile += URItoFileName(RealURI); + + // do the final md5sum checking + MD5Summation sum; + FileFd Fd(DestFile, FileFd::ReadOnly); + sum.AddFD(Fd.Fd(), Fd.Size()); + Fd.Close(); + string MD5 = (string)sum.Result(); + + if (!ExpectedMD5.empty() && MD5 != ExpectedMD5) + { + Status = StatAuthError; + ErrorText = _("MD5Sum mismatch"); + Rename(DestFile,DestFile + ".FAILED"); + Dequeue(); + return; + } + + // this is for the "real" finish + Complete = true; + Status = StatDone; + Dequeue(); + if(Debug) + std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl; + return; + } + + if(Debug) + std::clog << "Finishing: " << Desc.URI << std::endl; + Complete = false; + Status = StatDone; + Dequeue(); + return; +} + + + +bool pkgAcqIndexDiffs::QueueNextDiff() +{ + + // calc sha1 of the just patched file + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + + FileFd fd(FinalFile, FileFd::ReadOnly); + SHA1Summation SHA1; + SHA1.AddFD(fd.Fd(), fd.Size()); + string local_sha1 = string(SHA1.Result()); + if(Debug) + std::clog << "QueueNextDiff: " + << FinalFile << " (" << local_sha1 << ")"<<std::endl; + + // remove all patches until the next matching patch is found + // this requires the Index file to be ordered + for(vector<DiffInfo>::iterator I=available_patches.begin(); + available_patches.size() > 0 && + I != available_patches.end() && + (*I).sha1 != local_sha1; + I++) + { + available_patches.erase(I); + } + + // error checking and falling back if no patch was found + if(available_patches.size() == 0) + { + Failed("", NULL); + return false; + } + + // queue the right diff + Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz"; + Desc.Description = available_patches[0].file + string(".pdiff"); + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file); + + if(Debug) + std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl; + + QueueURI(Desc); + + return true; +} + + + +void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl; + + Item::Done(Message,Size,Md5Hash,Cnf); + + string FinalFile; + FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); + + // sucess in downloading a diff, enter ApplyDiff state + if(State == StateFetchDiff) + { + + if(Debug) + std::clog << "Sending to gzip method: " << FinalFile << std::endl; + + string FileName = LookupTag(Message,"Filename"); + State = StateUnzipDiff; + Local = true; + Desc.URI = "gzip:" + FileName; + DestFile += ".decomp"; + QueueURI(Desc); + Mode = "gzip"; + return; + } + + // sucess in downloading a diff, enter ApplyDiff state + if(State == StateUnzipDiff) + { + + // rred excepts the patch as $FinalFile.ed + Rename(DestFile,FinalFile+".ed"); + + if(Debug) + std::clog << "Sending to rred method: " << FinalFile << std::endl; + + State = StateApplyDiff; + Local = true; + Desc.URI = "rred:" + FinalFile; + QueueURI(Desc); + Mode = "rred"; + return; + } + + + // success in download/apply a diff, queue next (if needed) + if(State == StateApplyDiff) + { + // remove the just applied patch + available_patches.erase(available_patches.begin()); + + // move into place + if(Debug) + { + std::clog << "Moving patched file in place: " << std::endl + << DestFile << " -> " << FinalFile << std::endl; + } + Rename(DestFile,FinalFile); + + // see if there is more to download + if(available_patches.size() > 0) { + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, available_patches); + return Finish(); + } else + return Finish(true); + } +} + + // AcqIndex::AcqIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package file is added to the queue and a second class is instantiated to fetch the revision file */ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, string comprExt) : - Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5) + string ExpectedMD5, string comprExt) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5) { Decompression = false; Erase = false; @@ -184,7 +604,7 @@ string pkgAcqIndex::Custom600Headers() void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { // no .bz2 found, retry with .gz - if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") { + if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; // retry with a gzip one @@ -290,7 +710,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, else Local = true; - string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1); + string compExt = Desc.URI.substr(Desc.URI.size()-3); char *decompProg; if(compExt == "bz2") decompProg = "bzip2"; @@ -344,10 +764,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, const vector<IndexTarget*>* IndexTargets, indexRecords* MetaIndexParser) : Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI), - MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc) + MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -370,12 +789,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, // File was already in place. It needs to be re-verified // because Release might have changed, so Move it into partial Rename(Final,DestFile); - // unlink the file and do not try to use I-M-S and Last-Modified - // if the users proxy is broken - if(_config->FindB("Acquire::BrokenProxy", false) == true) { - std::cerr << "forcing re-get of the signature file as requested" << std::endl; - unlink(DestFile.c_str()); - } } QueueURI(Desc); @@ -425,18 +838,19 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { - // Delete any existing sigfile, so that this source isn't - // mistakenly trusted - string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); - unlink(Final.c_str()); - // if we get a timeout if fail + // if we get a network error we fail gracefully if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure") { + LookupTag(Message,"FailReason") == "TmpResolveFailure" || + LookupTag(Message,"FailReason") == "ConnectionRefused") { Item::Failed(Message,Cnf); return; } + // Delete any existing sigfile when the acquire failed + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + unlink(Final.c_str()); + // queue a pkgAcqMetaIndex with no sigfile new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, "", IndexTargets, MetaIndexParser); @@ -459,11 +873,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, string SigFile, const vector<struct IndexTarget*>* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), SigFile(SigFile) + Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false) { - this->AuthPass = false; - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -555,6 +967,9 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) return; } + // see if the download was a IMSHit + IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false); + Complete = true; string FinalFile = _config->FindDir("Dir::State::lists"); @@ -583,7 +998,7 @@ void pkgAcqMetaIndex::AuthDone(string Message) return; } - if (!VerifyVendor()) + if (!VerifyVendor(Message)) { return; } @@ -635,13 +1050,18 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) } } - // Queue Packages file - new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + // Queue Packages file (either diff or full packages files, depending + // on the users option) + if(_config->FindB("Acquire::PDiffs",true) == true) + new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); + else + new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); } } -bool pkgAcqMetaIndex::VerifyVendor() +bool pkgAcqMetaIndex::VerifyVendor(string Message) { // // Maybe this should be made available from above so we don't have // // to read and parse it every time? @@ -666,6 +1086,22 @@ bool pkgAcqMetaIndex::VerifyVendor() // break; // } // } + string::size_type pos; + + // check for missing sigs (that where not fatal because otherwise we had + // bombed earlier) + string missingkeys; + string msg = _("There are no public key available for the " + "following key IDs:\n"); + pos = Message.find("NO_PUBKEY "); + if (pos != std::string::npos) + { + string::size_type start = pos+strlen("NO_PUBKEY "); + string Fingerprint = Message.substr(start, Message.find("\n")-start); + missingkeys += (Fingerprint); + } + if(!missingkeys.empty()) + _error->Warning("%s", string(msg+missingkeys).c_str()); string Transformed = MetaIndexParser->GetExpectedDist(); @@ -674,7 +1110,7 @@ bool pkgAcqMetaIndex::VerifyVendor() Transformed = "experimental"; } - string::size_type pos = Transformed.rfind('/'); + pos = Transformed.rfind('/'); if (pos != string::npos) { Transformed = Transformed.substr(0, pos); @@ -720,10 +1156,30 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { if (AuthPass == true) { - // gpgv method failed + // if we fail the authentication but got the file via a IMS-Hit + // this means that the file wasn't downloaded and that it might be + // just stale (server problem, proxy etc). we delete what we have + // queue it again without i-m-s + // alternatively we could just unlink the file and let the user try again + if (IMSHit) + { + Complete = false; + Local = false; + AuthPass = false; + unlink(DestFile.c_str()); + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI); + Desc.URI = RealURI; + QueueURI(Desc); + return; + } + + // gpgv method failed _error->Warning("GPG error: %s: %s", Desc.Description.c_str(), LookupTag(Message,"Message").c_str()); + } // No Release file was present, or verification failed, so fall @@ -799,6 +1255,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, } } + // "allow-unauthenticated" restores apts old fetching behaviour + // that means that e.g. unauthenticated file:// uris are higher + // priority than authenticated http:// uris + if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) + Trusted = false; + // Select a source if (QueueNext() == false && _error->PendingError() == false) _error->Error(_("I wasn't able to locate file for the %s package. " @@ -1031,13 +1493,19 @@ void pkgAcqArchive::Finished() // --------------------------------------------------------------------- /* The file is added to the queue */ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, - unsigned long Size,string Dsc,string ShortDesc) : + unsigned long Size,string Dsc,string ShortDesc, + const string &DestDir, const string &DestFilename) : Item(Owner), Md5Hash(MD5) { Retries = _config->FindI("Acquire::Retries",0); - DestFile = flNotDir(URI); - + if(!DestFilename.empty()) + DestFile = DestFilename; + else if(!DestDir.empty()) + DestFile = DestDir + "/" + flNotDir(URI); + else + DestFile = flNotDir(URI); + // Create the item Desc.URI = URI; Desc.Description = Dsc; @@ -1057,7 +1525,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, else PartialSize = Buf.st_size; } - + QueueURI(Desc); } /*}}}*/ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index ae2fba4d5..217ddb3ef 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -31,67 +31,486 @@ #pragma interface "apt-pkg/acquire-item.h" #endif -// Item to acquire +/** \addtogroup acquire + * @{ + * + * \file acquire-item.h + */ + +/** \brief Represents the process by which a pkgAcquire object should + * retrieve a file or a collection of files. + * + * By convention, Item subclasses should insert themselves into the + * acquire queue when they are created by calling QueueURI(), and + * remove themselves by calling Dequeue() when either Done() or + * Failed() is invoked. Item objects are also responsible for + * notifying the download progress indicator (accessible via + * #Owner->Log) of their status. + * + * \see pkgAcquire + */ class pkgAcquire::Item { protected: - // Some private helper methods for registering URIs + /** \brief The acquire object with which this item is associated. */ pkgAcquire *Owner; + + /** \brief Insert this item into its owner's queue. + * + * \param ItemDesc Metadata about this item (its URI and + * description). + */ inline void QueueURI(ItemDesc &Item) {Owner->Enqueue(Item);}; + + /** \brief Remove this item from its owner's queue. */ inline void Dequeue() {Owner->Dequeue(this);}; - // Safe rename function with timestamp preservation + /** \brief Rename a file without modifying its timestamp. + * + * Many item methods call this as their final action. + * + * \param From The file to be renamed. + * + * \param To The new name of #From. If #To exists it will be + * overwritten. + */ void Rename(string From,string To); public: - // State of the item - enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status; + /** \brief The current status of this item. */ + enum ItemState + { + /** \brief The item is waiting to be downloaded. */ + StatIdle, + + /** \brief The item is currently being downloaded. */ + StatFetching, + + /** \brief The item has been successfully downloaded. */ + StatDone, + + /** \brief An error was encountered while downloading this + * item. + */ + StatError, + + /** \brief The item was downloaded but its authenticity could + * not be verified. + */ + StatAuthError + } Status; + + /** \brief Contains a textual description of the error encountered + * if #Status is #StatError or #StatAuthError. + */ string ErrorText; + + /** \brief The size of the object to fetch. */ unsigned long FileSize; - unsigned long PartialSize; + + /** \brief How much of the object was already fetched. */ + unsigned long PartialSize; + + /** \brief If not \b NULL, contains the name of a subprocess that + * is operating on this object (for instance, "gzip" or "gpgv"). + */ const char *Mode; + + /** \brief A client-supplied unique identifier. + * + * This field is initalized to 0; it is meant to be filled in by + * clients that wish to use it to uniquely identify items. + * + * \todo it's unused in apt itself + */ unsigned long ID; + + /** \brief If \b true, the entire object has been successfully fetched. + * + * Subclasses should set this to \b true when appropriate. + */ bool Complete; + + /** \brief If \b true, the URI of this object is "local". + * + * The only effect of this field is to exclude the object from the + * download progress indicator's overall statistics. + */ bool Local; - // Number of queues we are inserted into + /** \brief The number of fetch queues into which this item has been + * inserted. + * + * There is one queue for each source from which an item could be + * downloaded. + * + * \sa pkgAcquire + */ unsigned int QueueCounter; - // File to write the fetch into + /** \brief The name of the file into which the retrieved object + * will be written. + */ string DestFile; - // Action members invoked by the worker + /** \brief Invoked by the acquire worker when the object couldn't + * be fetched. + * + * This is a branch of the continuation of the fetch process. + * + * \param Message An RFC822-formatted message from the acquire + * method describing what went wrong. Use LookupTag() to parse + * it. + * + * \param Cnf The method via which the worker tried to fetch this object. + * + * \sa pkgAcqMethod + */ virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + + /** \brief Invoked by the acquire worker when the object was + * fetched successfully. + * + * Note that the object might \e not have been written to + * DestFile; check for the presence of an Alt-Filename entry in + * Message to find the file to which it was really written. + * + * Done is often used to switch from one stage of the processing + * to the next (e.g. fetching, unpacking, copying). It is one + * branch of the continuation of the fetch process. + * + * \param Message Data from the acquire method. Use LookupTag() + * to parse it. + * \param Size The size of the object that was fetched. + * \param Md5Hash The MD5Sum of the object that was fetched. + * \param Cnf The method via which the object was fetched. + * + * \sa pkgAcqMethod + */ virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); + + /** \brief Invoked when the worker starts to fetch this object. + * + * \param Message RFC822-formatted data from the worker process. + * Use LookupTag() to parse it. + * + * \param Size The size of the object being fetched. + * + * \sa pkgAcqMethod + */ virtual void Start(string Message,unsigned long Size); + + /** \brief Custom headers to be sent to the fetch process. + * + * \return a string containing RFC822-style headers that are to be + * inserted into the 600 URI Acquire message sent to the fetch + * subprocess. The headers are inserted after a newline-less + * line, so they should (if nonempty) have a leading newline and + * no trailing newline. + */ virtual string Custom600Headers() {return string();}; + + /** \brief A "descriptive" URI-like string. + * + * \return a URI that should be used to describe what is being fetched. + */ virtual string DescURI() = 0; + /** \brief Short item description. + * + * \return a brief description of the object being fetched. + */ virtual string ShortDesc() {return DescURI();} + + /** \brief Invoked by the worker when the download is completely done. */ virtual void Finished() {}; - // Inquire functions + /** \brief MD5Sum. + * + * \return the MD5Sum of this object, if applicable; otherwise, an + * empty string. + */ virtual string MD5Sum() {return string();}; + + /** \return the acquire process with which this item is associated. */ pkgAcquire *GetOwner() {return Owner;}; + + /** \return \b true if this object is being fetched from a trusted source. */ virtual bool IsTrusted() {return false;}; - + + /** \brief Initialize an item. + * + * Adds the item to the list of items known to the acquire + * 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. + */ Item(pkgAcquire *Owner); + + /** \brief Remove this item from its owner's queue by invoking + * pkgAcquire::Remove. + */ virtual ~Item(); }; -// Item class for index files -class pkgAcqIndex : public pkgAcquire::Item +/** \brief Information about an index patch (aka diff). */ +struct DiffInfo { + /** The filename of the diff. */ + string file; + + /** The sha1 hash of the diff. */ + string sha1; + + /** The size of the diff. */ + unsigned long size; +}; + +/** \brief An item that is responsible for fetching an index file of + * package list diffs and starting the package list's download. + * + * This item downloads the Index file and parses it, then enqueues + * additional downloads of either the individual patches (using + * pkgAcqIndexDiffs) or the entire Packages file (using pkgAcqIndex). + * + * \sa pkgAcqIndexDiffs, pkgAcqIndex + */ +class pkgAcqDiffIndex : public pkgAcquire::Item { + 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). + */ + string RealURI; + + /** \brief The MD5Sum that the real index file should have after + * all patches have been applied. + */ + string ExpectedMD5; + + /** \brief The index file which will be patched to generate the new + * file. + */ + string CurrentPackagesFile; + + /** \brief A description of the Packages file (stored in + * pkgAcquire::ItemDesc::Description). + */ + string Description; + + public: + // Specialized action members + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual void Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf); + virtual string DescURI() {return RealURI + "Index";}; + virtual string Custom600Headers(); + + /** \brief Parse the Index file for a set of Packages diffs. + * + * Parses the Index file and creates additional download items as + * necessary. + * + * \param IndexDiffFile The name of the Index file. + * + * \return \b true if the Index file was successfully parsed, \b + * false otherwise. + */ + bool ParseDiffIndex(string IndexDiffFile); + + + /** \brief Create a new pkgAcqDiffIndex. + * + * \param Owner The Acquire object that owns this item. + * + * \param URI The URI of the list file to download. + * + * \param URIDesc A long description of the list file to download. + * + * \param ShortDesc A short description of the list file to download. + * + * \param ExpectedMD5 The list file's MD5 signature. + */ + pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc, + string ShortDesc, string ExpectedMD5); +}; + +/** \brief An item that is responsible for fetching all the patches + * that need to be applied to a given package index file. + * + * After downloading and applying a single patch, this item will + * enqueue a new pkgAcqIndexDiffs to download and apply the remaining + * patches. If no patch can be found that applies to an intermediate + * file or if one of the patches cannot be downloaded, falls back to + * downloading the entire package index file using pkgAcqIndex. + * + * \sa pkgAcqDiffIndex, pkgAcqIndex + */ +class pkgAcqIndexDiffs : public pkgAcquire::Item +{ + private: + + /** \brief Queue up the next diff download. + * + * Search for the next available diff that applies to the file + * that currently exists on disk, and enqueue it by calling + * QueueURI(). + * + * \return \b true if an applicable diff was found, \b false + * otherwise. + */ + bool QueueNextDiff(); + + /** \brief Handle tasks that must be performed after the item + * finishes downloading. + * + * Dequeues the item and checks the resulting file's md5sum + * against ExpectedMD5 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. + * + * \param allDone If \b true, the file was entirely reconstructed, + * and its md5sum is verified. + */ + void Finish(bool allDone=false); + protected: + + /** \brief If \b true, debugging output will be written to + * std::clog. + */ + 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. + */ + string RealURI; + + /** \brief The MD5Sum of the package index file that is being + * reconstructed. + */ + string ExpectedMD5; + + /** A description of the file being downloaded. */ + string Description; + + /** The patches that remain to be downloaded, including the patch + * being downloaded right now. This list should be ordered so + * that each diff appears before any diff that depends on it. + * + * \todo These are indexed by sha1sum; why not use some sort of + * dictionary instead of relying on ordering and stripping them + * off the front? + */ + vector<DiffInfo> available_patches; + /** The current status of this patch. */ + enum DiffState + { + /** \brief The diff is in an unknown state. */ + StateFetchUnkown, + + /** \brief The diff is currently being fetched. */ + StateFetchDiff, + + /** \brief The diff is currently being uncompressed. */ + StateUnzipDiff, + + /** \brief The diff is currently being applied. */ + StateApplyDiff + } State; + + public: + /** \brief Called when the patch file failed to be downloaded. + * + * This method will fall back to downloading the whole index file + * outright; its arguments are ignored. + */ + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + + virtual void Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf); + virtual string DescURI() {return RealURI + "Index";}; + + /** \brief Create an index diff item. + * + * After filling in its basic fields, this invokes Finish(true) if + * #diffs is empty, or QueueNextDiff() otherwise. + * + * \param Owner The pkgAcquire object that owns this item. + * + * \param URI The URI of the package index file being + * reconstructed. + * + * \param URIDesc A long description of this item. + * + * \param ShortDesc A brief description of this item. + * + * \param ExpectedMD5 The expected md5sum of the completely + * reconstructed package index file; the index file will be tested + * against this value when it is entirely reconstructed. + * + * \param diffs The remaining diffs from the index of diffs. They + * should be ordered so that each diff appears before any diff + * that depends on it. + */ + pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, + string ShortDesc, string ExpectedMD5, + vector<DiffInfo> diffs=vector<DiffInfo>()); +}; + +/** \brief An acquire item that is responsible for fetching an index + * file (e.g., Packages or Sources). + * + * \sa pkgAcqDiffIndex, pkgAcqIndexDiffs, pkgAcqIndexTrans + * + * \todo Why does pkgAcqIndex have protected members? + */ +class pkgAcqIndex : public pkgAcquire::Item +{ + protected: + + /** \brief If \b true, the index file has been decompressed. */ bool Decompression; + + /** \brief If \b true, the partially downloaded file will be + * removed when the download completes. + */ bool Erase; + + /** \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). + */ string RealURI; + + /** \brief The expected md5sum of the decompressed index file. */ string ExpectedMD5; + + /** \brief The compression-related file extension that is being + * added to the downloaded file (e.g., ".gz" or ".bz2"). + */ string CompressionExtension; public: @@ -103,36 +522,120 @@ class pkgAcqIndex : public pkgAcquire::Item virtual string Custom600Headers(); virtual string DescURI() {return RealURI + CompressionExtension;}; + /** \brief Create a pkgAcqIndex. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param URI The URI of the index file that is to be downloaded. + * + * \param URIDesc A "URI-style" description of this index file. + * + * \param ShortDesc A brief description of this index file. + * + * \param ExpectedMD5 The expected md5sum of this index file. + * + * \param compressExt The compression-related extension with which + * this index file should be downloaded, or "" to autodetect + * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + */ pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct, string ExpectedMD5, string compressExt=""); + string ShortDesc, string ExpectedMD5, string compressExt=""); }; -// Item class for translated package index files +/** \brief An acquire item that is responsible for fetching a + * translated index file. + * + * The only difference from pkgAcqIndex is that transient failures + * are suppressed: no error occurs if the translated index file is + * missing. + */ class pkgAcqIndexTrans : public pkgAcqIndex { public: virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + + /** \brief Create a pkgAcqIndexTrans. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param URI The URI of the index file that is to be downloaded. + * + * \param URIDesc A "URI-style" description of this index file. + * + * \param ShortDesc A brief description of this index file. + * + * \param ExpectedMD5 The expected md5sum of this index file. + * + * \param compressExt The compression-related extension with which + * this index file should be downloaded, or "" to autodetect + * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + */ pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct); + string ShortDesc); }; +/** \brief Information about an index file. */ struct IndexTarget { + /** \brief A URI from which the index file can be downloaded. */ string URI; + + /** \brief A description of the index file. */ string Description; + + /** \brief A shorter description of the index file. */ string ShortDesc; + + /** \brief The key by which this index file should be + * looked up within the meta signature file. + */ string MetaKey; }; -// Item class for index signatures +/** \brief An acquire item that downloads the detached signature + * of a meta-index (Release) file, then queues up the release + * file itself. + * + * \todo Why protected members? + * + * \sa pkgAcqMetaIndex + */ class pkgAcqMetaSig : public pkgAcquire::Item { protected: - + /** \brief The fetch request that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI,MetaIndexURI,MetaIndexURIDesc,MetaIndexShortDesc; + + /** \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. + */ + string RealURI; + + /** \brief The URI of the meta-index file to be fetched after the signature. */ + string MetaIndexURI; + + /** \brief A "URI-style" description of the meta-index file to be + * fetched after the signature. + */ + string MetaIndexURIDesc; + + /** \brief A brief description of the meta-index file to be fetched + * after the signature. + */ + string MetaIndexShortDesc; + + /** \brief A package-system-specific parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief The index files which should be looked up in the meta-index + * and then downloaded. + * + * \todo Why a list of pointers instead of a list of structs? + */ const vector<struct IndexTarget*>* IndexTargets; public: @@ -144,27 +647,90 @@ class pkgAcqMetaSig : public pkgAcquire::Item virtual string Custom600Headers(); virtual string DescURI() {return RealURI; }; + /** \brief Create a new pkgAcqMetaSig. */ pkgAcqMetaSig(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, string MetaIndexURI, string MetaIndexURIDesc, string MetaIndexShortDesc, const vector<struct IndexTarget*>* IndexTargets, indexRecords* MetaIndexParser); }; -// Item class for index signatures +/** \brief An item that is responsible for downloading the meta-index + * file (i.e., Release) itself and verifying its signature. + * + * Once the download and verification are complete, the downloads of + * the individual index files are queued up using pkgAcqDiffIndex. + * If the meta-index file had a valid signature, the expected md5sums + * of the index files will be the md5sums listed in the meta-index; + * otherwise, the expected md5sums will be "" (causing the + * authentication of the index files to be bypassed). + */ class pkgAcqMetaIndex : public pkgAcquire::Item { protected: - + /** \brief The fetch command that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI; // FIXME: is this redundant w/ Desc.URI? + + /** \brief The URI that is actually being downloaded; never + * modified by pkgAcqMetaIndex. + */ + string RealURI; + + /** \brief The file in which the signature for this index was stored. + * + * If empty, the signature and the md5sums of the individual + * indices will not be checked. + */ string SigFile; + + /** \brief The index files to download. */ const vector<struct IndexTarget*>* IndexTargets; + + /** \brief The parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief If \b true, the index's signature is currently being verified. + */ bool AuthPass; + // required to deal gracefully with problems caused by incorrect ims hits + bool IMSHit; - bool VerifyVendor(); + /** \brief Check that the release file is a release file for the + * correct distribution. + * + * \return \b true if no fatal errors were encountered. + */ + bool VerifyVendor(string Message); + + /** \brief Called when a file is finished being retrieved. + * + * If the file was not downloaded to DestFile, a copy process is + * set up to copy it to DestFile; otherwise, Complete is set to \b + * true and the file is moved to its final location. + * + * \param Message The message block received from the fetch + * subprocess. + */ void RetrievalDone(string Message); + + /** \brief Called when authentication succeeded. + * + * Sanity-checks the authenticated file, queues up the individual + * index files for download, and saves the signature in the lists + * directory next to the authenticated list file. + * + * \param Message The message block received from the fetch + * subprocess. + */ void AuthDone(string Message); + + /** \brief Starts downloading the individual index files. + * + * \param verify If \b true, only indices whose expected md5sum + * can be determined from the meta-index will be downloaded, and + * the md5sums of indices will be checked (reporting + * #StatAuthError if there is a mismatch). If verify is \b false, + * no md5sum checking will be performed. + */ void QueueIndexes(bool verify); public: @@ -176,6 +742,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item virtual string Custom600Headers(); virtual string DescURI() {return RealURI; }; + /** \brief Create a new pkgAcqMetaIndex. */ pkgAcqMetaIndex(pkgAcquire *Owner, string URI,string URIDesc, string ShortDesc, string SigFile, @@ -183,28 +750,58 @@ class pkgAcqMetaIndex : public pkgAcquire::Item indexRecords* MetaIndexParser); }; -// Item class for archive files +/** \brief An item that is responsible for fetching a package file. + * + * If the package file already exists in the cache, nothing will be + * done. + */ class pkgAcqArchive : public pkgAcquire::Item { protected: - - // State information for the retry mechanism + /** \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. + */ pkgSourceList *Sources; + + /** \brief A package records object, used to look up the file + * corresponding to each version of the package. + */ pkgRecords *Recs; + + /** \brief The md5sum of this package. */ string MD5; + + /** \brief A location in which the actual filename of the package + * should be stored. + */ string &StoreFilename; + + /** \brief The next file for this version to try to download. */ pkgCache::VerFileIterator Vf; + + /** \brief How many (more) times to try to find a new source from + * which to download this package version if it fails. + * + * Set from Acquire::Retries. + */ unsigned int Retries; + + /** \brief \b true if this version file is being downloaded from a + * trusted source. + */ bool Trusted; - // Queue the next available file for download. + /** \brief Queue up the next available file for this version. */ bool QueueNext(); public: - // Specialized action members virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); @@ -212,18 +809,49 @@ class pkgAcqArchive : public pkgAcquire::Item virtual string DescURI() {return Desc.URI;}; virtual string ShortDesc() {return Desc.ShortDesc;}; virtual void Finished(); + virtual bool IsTrusted(); + /** \brief Create a new pkgAcqArchive. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param Sources The sources from which to download version + * files. + * + * \param Recs A package records object, used to look up the file + * corresponding to each version of the package. + * + * \param Version The package version to download. + * + * \param StoreFilename A location in which the actual filename of + * the package should be stored. It will be set to a guessed + * basename in the constructor, and filled in with a fully + * qualified filename once the download finishes. + */ pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs,pkgCache::VerIterator const &Version, string &StoreFilename); }; -// Fetch a generic file to the current directory +/** \brief Retrieve an arbitrary file to the current directory. + * + * The file is retrieved even if it is accessed via a URL type that + * normally is a NOP, such as "file". If the download fails, the + * partial file is renamed to get a ".FAILED" extension. + */ class pkgAcqFile : public pkgAcquire::Item { + /** \brief The currently active download process. */ pkgAcquire::ItemDesc Desc; + + /** \brief The md5sum of the file to download, if it is known. */ string Md5Hash; + + /** \brief How many times to retry the download, set from + * Acquire::Retries. + */ unsigned int Retries; public: @@ -234,9 +862,41 @@ class pkgAcqFile : public pkgAcquire::Item pkgAcquire::MethodConfig *Cnf); virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - - pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size, - string Desc,string ShortDesc); + + /** \brief Create a new pkgAcqFile object. + * + * \param Owner The pkgAcquire object with which this object is + * associated. + * + * \param URI The URI to download. + * + * \param MD5 The md5sum of the file to download, if it is known; + * otherwise "". + * + * \param Size The size of the file to download, if it is known; + * otherwise 0. + * + * \param Desc A description of the file being downloaded. + * + * \param ShortDesc A brief description of the file being + * downloaded. + * + * \param DestDir The directory the file should be downloaded into. + * + * \param DestFilename The filename+path the file is downloaded to. + * + * + * If DestFilename is empty, download to DestDir/<basename> if + * DestDir is non-empty, $CWD/<basename> otherwise. If + * DestFilename is NOT empty, DestDir is ignored and DestFilename + * is the absolute name to which the file should be downloaded. + */ + + pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size, + string Desc, string ShortDesc, + const string &DestDir="", const string &DestFilename=""); }; +/** @} */ + #endif diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index f46209d12..4f08a43ae 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -10,6 +10,13 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-method.h + */ + #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H @@ -86,4 +93,6 @@ class pkgAcqMethod virtual ~pkgAcqMethod() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 6e1952202..1f6bcc05f 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -9,6 +9,13 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-worker.h + */ + #ifndef PKGLIB_ACQUIRE_WORKER_H #define PKGLIB_ACQUIRE_WORKER_H @@ -18,7 +25,25 @@ #pragma interface "apt-pkg/acquire-worker.h" #endif -// Interfacing to the method process +/** \brief A fetch subprocess. + * + * A worker process is responsible for one stage of the fetch. This + * class encapsulates the communications protocol between the master + * process and the worker, from the master end. + * + * Each worker is intrinsically placed on two linked lists. The + * Queue list (maintained in the #NextQueue variable) is maintained + * by the pkgAcquire::Queue class; it represents the set of workers + * assigned to a particular queue. The Acquire list (maintained in + * the #NextAcquire variable) is maintained by the pkgAcquire class; + * it represents the set of active workers for a particular + * pkgAcquire object. + * + * \todo Like everything else in the Acquire system, this has way too + * many protected items. + * + * \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire + */ class pkgAcquire::Worker { friend class pkgAcquire; @@ -26,64 +51,274 @@ class pkgAcquire::Worker protected: friend class Queue; - /* Linked list starting at a Queue and a linked list starting - at Acquire */ + /** \brief The next link on the Queue list. + * + * \todo This is always NULL; is it just for future use? + */ Worker *NextQueue; + + /** \brief The next link on the Acquire list. */ Worker *NextAcquire; - // The access association + /** \brief The Queue with which this worker is associated. */ Queue *OwnerQ; + + /** \brief The download progress indicator to which progress + * messages should be sent. + */ pkgAcquireStatus *Log; + + /** \brief The configuration of this method. On startup, the + * target of this pointer is filled in with basic data about the + * method, as reported by the worker. + */ MethodConfig *Config; + + /** \brief The access method to be used by this worker. + * + * \todo Doesn't this duplicate Config->Access? + */ string Access; - // This is the subprocess IPC setup + /** \brief The PID of the subprocess. */ pid_t Process; + + /** \brief A file descriptor connected to the standard output of + * the subprocess. + * + * Used to read messages and data from the subprocess. + */ int InFd; + + /** \brief A file descriptor connected to the standard input of the + * subprocess. + * + * Used to send commands and configuration data to the subprocess. + */ int OutFd; + + /** \brief Set to \b true if the worker is in a state in which it + * might generate data or command responses. + * + * \todo Is this right? It's a guess. + */ bool InReady; + + /** \brief Set to \b true if the worker is in a state in which it + * is legal to send commands to it. + * + * \todo Is this right? + */ bool OutReady; - // Various internal things + /** If \b true, debugging output will be sent to std::clog. */ bool Debug; + + /** \brief The raw text values of messages received from the + * worker, in sequence. + */ vector<string> MessageQueue; + + /** \brief Buffers pending writes to the subprocess. + * + * \todo Wouldn't a std::dequeue be more appropriate? + */ string OutQueue; - // Private constructor helper + /** \brief Common code for the constructor. + * + * Initializes NextQueue and NextAcquire to NULL; Process, InFd, + * and OutFd to -1, OutReady and InReady to \b false, and Debug + * from _config. + */ void Construct(); - // Message handling things + /** \brief Retrieve any available messages from the subprocess. + * + * The messages are retrieved as in ::ReadMessages(), and + * MessageFailure() is invoked if an error occurs; in particular, + * if the pipe to the subprocess dies unexpectedly while a message + * is being read. + * + * \return \b true if the messages were successfully read, \b + * false otherwise. + */ bool ReadMessages(); + + /** \brief Parse and dispatch pending messages. + * + * This dispatches the message in a manner appropriate for its + * type. + * + * \todo Several message types lack separate handlers. + * + * \sa Capabilities(), SendConfiguration(), MediaChange() + */ bool RunMessages(); + + /** \brief Read and dispatch any pending messages from the + * subprocess. + * + * \return \b false if the subprocess died unexpectedly while a + * message was being transmitted. + */ bool InFdReady(); + + /** \brief Send any pending commands to the subprocess. + * + * This method will fail if there is no pending output. + * + * \return \b true if all commands were succeeded, \b false if an + * error occurred (in which case MethodFailure() will be invoked). + */ bool OutFdReady(); - // The message handlers + /** \brief Handle a 100 Capabilities response from the subprocess. + * + * \param Message the raw text of the message from the subprocess. + * + * The message will be parsed and its contents used to fill + * #Config. If #Config is NULL, this routine is a NOP. + * + * \return \b true. + */ bool Capabilities(string Message); + + /** \brief Send a 601 Configuration message (containing the APT + * configuration) to the subprocess. + * + * The APT configuration will be send to the subprocess in a + * message of the following form: + * + * <pre> + * 601 Configuration + * Config-Item: Fully-Qualified-Item=Val + * Config-Item: Fully-Qualified-Item=Val + * ... + * </pre> + * + * \return \b true if the command was successfully sent, \b false + * otherwise. + */ bool SendConfiguration(); + + /** \brief Handle a 403 Media Change message. + * + * \param Message the raw text of the message; the Media field + * indicates what type of media should be changed, and the Drive + * field indicates where the media is located. + * + * Invokes pkgAcquireStatus::MediaChange(Media, Drive) to ask the + * user to swap disks; informs the subprocess of the result (via + * 603 Media Changed, with the Failed field set to \b true if the + * user cancelled the media change). + */ bool MediaChange(string Message); + /** \brief Invoked when the worked process dies unexpectedly. + * + * Waits for the subprocess to terminate and generates an error if + * it terminated abnormally, then closes and blanks out all file + * descriptors. Discards all pending messages from the + * subprocess. + * + * \return \b false. + */ bool MethodFailure(); + + /** \brief Invoked when a fetch job is completed, either + * successfully or unsuccessfully. + * + * Resets the status information for the worker process. + */ void ItemDone(); public: - // The curent method state + /** \brief The queue entry that is currently being downloaded. */ pkgAcquire::Queue::QItem *CurrentItem; + + /** \brief The most recent status string received from the + * subprocess. + */ string Status; + + /** \brief How many bytes of the file have been downloaded. Zero + * if the current progress of the file cannot be determined. + */ unsigned long CurrentSize; + + /** \brief The total number of bytes to be downloaded. Zero if the + * total size of the final is unknown. + */ unsigned long TotalSize; + + /** \brief How much of the file was already downloaded prior to + * starting this worker. + */ unsigned long ResumePoint; - // Load the method and do the startup + /** \brief Tell the subprocess to download the given item. + * + * \param Item the item to queue up. + * \return \b true if the item was successfully enqueued. + * + * Queues up a 600 URI Acquire message for the given item to be + * sent at the next possible moment. Does \e not flush the output + * queue. + */ bool QueueItem(pkgAcquire::Queue::QItem *Item); + + /** \brief Start up the worker and fill in #Config. + * + * Reads the first message from the worker, which is assumed to be + * a 100 Capabilities message. + * + * \return \b true if all operations completed successfully. + */ bool Start(); + + /** \brief Update the worker statistics (CurrentSize, TotalSize, + * etc). + */ void Pulse(); + + /** \return The fetch method configuration. */ inline const MethodConfig *GetConf() const {return Config;}; - + + /** \brief Create a new Worker to download files. + * + * \param OwnerQ The queue into which this worker should be + * placed. + * + * \param Config A location in which to store information about + * the fetch method. + * + * \param Log The download progress indicator that should be used + * to report the progress of this worker. + */ Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log); + + /** \brief Create a new Worker that should just retrieve + * information about the fetch method. + * + * Nothing in particular forces you to refrain from actually + * downloading stuff, but the various status callbacks won't be + * invoked. + * + * \param Config A location in which to store information about + * the fetch method. + */ Worker(MethodConfig *Config); + + /** \brief Clean up this worker. + * + * Closes the file descriptors; if MethodConfig::NeedsCleanup is + * \b false, also rudely interrupts the worker with a SIGINT. + */ ~Worker(); }; +/** @} */ + #endif diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 62209e65b..fff1b2b6a 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -266,7 +266,11 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) Worker Work(Conf); if (Work.Start() == false) return 0; - + + /* if a method uses DownloadLimit, we switch to SingleInstance mode */ + if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) + Conf->SingleInstance = true; + return Conf; } /*}}}*/ @@ -814,7 +818,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); - snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + // only show the ETA if it makes sense + if (ETA > 0 && ETA < 172800 /* two days */ ) + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + else + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems); + + // build the status str status << "dlstatus:" << i diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 27bb3d363..64dafdc9d 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -29,6 +29,40 @@ ##################################################################### */ /*}}}*/ + +/** \defgroup acquire Acquire system + * + * \brief The Acquire system is responsible for retrieving files from + * local or remote URIs and postprocessing them (for instance, + * verifying their authenticity). The core class in this system is + * pkgAcquire, which is responsible for managing the download queues + * during the download. There is at least one download queue for + * each supported protocol; protocols such as http may provide one + * queue per host. + * + * Each file to download is represented by a subclass of + * pkgAcquire::Item. The files add themselves to the download + * queue(s) by providing their URI information to + * pkgAcquire::Item::QueueURI, which calls pkgAcquire::Enqueue. + * + * Once the system is set up, the Run method will spawn subprocesses + * to handle the enqueued URIs; the scheduler will then take items + * from the queues and feed them into the handlers until the queues + * are empty. + * + * \todo Acquire supports inserting an object into several queues at + * once, but it is not clear what its behavior in this case is, and + * no subclass of pkgAcquire::Item seems to actually use this + * capability. + */ + +/** \addtogroup acquire + * + * @{ + * + * \file acquire.h + */ + #ifndef PKGLIB_ACQUIRE_H #define PKGLIB_ACQUIRE_H @@ -46,6 +80,15 @@ using std::string; #include <unistd.h> class pkgAcquireStatus; + +/** \brief The core download scheduler. + * + * This class represents an ongoing download. It manages the lists + * of active and pending downloads and handles setting up and tearing + * down download-related structures. + * + * \todo Why all the protected data items and methods? + */ class pkgAcquire { public: @@ -60,97 +103,299 @@ class pkgAcquire typedef vector<Item *>::iterator ItemIterator; typedef vector<Item *>::const_iterator ItemCIterator; - + protected: - // List of items to fetch + /** \brief A list of items to download. + * + * This is built monotonically as items are created and only + * emptied when the download shuts down. + */ vector<Item *> Items; - // List of active queues and fetched method configuration parameters + /** \brief The head of the list of active queues. + * + * \todo why a hand-managed list of queues instead of std::list or + * std::set? + */ Queue *Queues; + + /** \brief The head of the list of active workers. + * + * \todo why a hand-managed list of workers instead of std::list + * or std::set? + */ Worker *Workers; + + /** \brief The head of the list of acquire method configurations. + * + * Each protocol (http, ftp, gzip, etc) via which files can be + * fetched can have a representation in this list. The + * configuration data is filled in by parsing the 100 Capabilities + * string output by a method on startup (see + * pkgAcqMethod::pkgAcqMethod and pkgAcquire::GetConfig). + * + * \todo why a hand-managed config dictionary instead of std::map? + */ MethodConfig *Configs; + + /** \brief The progress indicator for this download. */ pkgAcquireStatus *Log; + + /** \brief The total size of the files which are to be fetched. + * + * This is not necessarily the total number of bytes to download + * when, e.g., download resumption and list updates via patches + * are taken into account. + */ unsigned long ToFetch; - // Configurable parameters for the schedular - enum {QueueHost,QueueAccess} QueueMode; + // Configurable parameters for the scheduler + + /** \brief Represents the queuing strategy for remote URIs. */ + enum QueueStrategy { + /** \brief Generate one queue for each protocol/host combination; downloads from + * multiple hosts can proceed in parallel. + */ + QueueHost, + /** \brief Generate a single queue for each protocol; serialize + * downloads from multiple hosts. + */ + QueueAccess} QueueMode; + + /** \brief If \b true, debugging information will be dumped to std::clog. */ bool Debug; + /** \brief If \b true, a download is currently in progress. */ bool Running; - + + /** \brief Add the given item to the list of items. */ void Add(Item *Item); + + /** \brief Remove the given item from the list of items. */ void Remove(Item *Item); + + /** \brief Add the given worker to the list of workers. */ void Add(Worker *Work); + + /** \brief Remove the given worker from the list of workers. */ void Remove(Worker *Work); + /** \brief Insert the given fetch request into the appropriate queue. + * + * \param Item The URI to download and the item to download it + * for. Copied by value into the queue; no reference to Item is + * retained. + */ void Enqueue(ItemDesc &Item); + + /** \brief Remove all fetch requests for this item from all queues. */ void Dequeue(Item *Item); + + /** \brief Determine the fetch method and queue of a URI. + * + * \param URI The URI to fetch. + * + * \param[out] Config A location in which to place the method via + * which the URI is to be fetched. + * + * \return the string-name of the queue in which a fetch request + * for the given URI should be placed. + */ string QueueName(string URI,MethodConfig const *&Config); - // FDSET managers for derived classes + /** \brief Build up the set of file descriptors upon which select() should + * block. + * + * The default implementation inserts the file descriptors + * corresponding to active downloads. + * + * \param[out] Fd The largest file descriptor in the generated sets. + * + * \param[out] RSet The set of file descriptors that should be + * watched for input. + * + * \param[out] WSet The set of file descriptors that should be + * watched for output. + */ virtual void SetFds(int &Fd,fd_set *RSet,fd_set *WSet); + + /** Handle input from and output to file descriptors which select() + * has determined are ready. The default implementation + * dispatches to all active downloads. + * + * \param RSet The set of file descriptors that are ready for + * input. + * + * \param WSet The set of file descriptors that are ready for + * output. + */ virtual void RunFds(fd_set *RSet,fd_set *WSet); - // A queue calls this when it dequeues an item + /** \brief Check for idle queues with ready-to-fetch items. + * + * Called by pkgAcquire::Queue::Done each time an item is dequeued + * but remains on some queues; i.e., another queue should start + * fetching it. + */ void Bump(); public: + /** \brief Retrieve information about a fetch method by name. + * + * \param Access The name of the method to look up. + * + * \return the method whose name is Access, or \b NULL if no such method exists. + */ MethodConfig *GetConfig(string Access); - enum RunResult {Continue,Failed,Cancelled}; + /** \brief Provides information on how a download terminated. */ + enum RunResult { + /** \brief All files were fetched successfully. */ + Continue, + + /** \brief Some files failed to download. */ + Failed, + + /** \brief The download was cancelled by the user (i.e., #Log's + * pkgAcquireStatus::Pulse() method returned \b false). + */ + Cancelled}; - RunResult Run(int PulseIntervall=500000); + /** \brief Download all the items that have been Add()ed to this + * download process. + * + * This method will block until the download completes, invoking + * methods on #Log to report on the progress of the download. + * + * \param PulseInterval The method pkgAcquireStatus::Pulse will be + * invoked on #Log at intervals of PulseInterval milliseconds. + * + * \return the result of the download. + */ + RunResult Run(int PulseInterval=500000); + + /** \brief Remove all items from this download process, terminate + * all download workers, and empty all queues. + */ void Shutdown(); - // Simple iteration mechanism + /** \brief Get the first #Worker object. + * + * \return the first active worker in this download process. + */ inline Worker *WorkersBegin() {return Workers;}; + + /** \brief Advance to the next #Worker object. + * + * \return the worker immediately following I, or \b NULL if none + * exists. + */ Worker *WorkerStep(Worker *I); + + /** \brief Get the head of the list of items. */ inline ItemIterator ItemsBegin() {return Items.begin();}; + + /** \brief Get the end iterator of the list of items. */ inline ItemIterator ItemsEnd() {return Items.end();}; // Iterate over queued Item URIs class UriIterator; + /** \brief Get the head of the list of enqueued item URIs. + * + * This iterator will step over every element of every active + * queue. + */ UriIterator UriBegin(); + /** \brief Get the end iterator of the list of enqueued item URIs. */ UriIterator UriEnd(); - // Cleans out the download dir + /** Deletes each entry in the given directory that is not being + * downloaded by this object. For instance, when downloading new + * list files, calling Clean() will delete the old ones. + * + * \param Dir The directory to be cleaned out. + * + * \return \b true if the directory exists and is readable. + */ bool Clean(string Dir); - // Returns the size of the total download set + /** \return the total size in bytes of all the items included in + * this download. + */ double TotalNeeded(); + + /** \return the size in bytes of all non-local items included in + * this download. + */ double FetchNeeded(); + + /** \return the amount of data to be fetched that is already + * present on the filesystem. + */ double PartialPresent(); + /** \brief Construct a new pkgAcquire. + * + * \param Log The progress indicator associated with this + * download, or \b NULL for none. This object is not owned by the + * download process and will not be deleted when the pkgAcquire + * object is destroyed. Naturally, it should live for at least as + * long as the pkgAcquire object does. + */ pkgAcquire(pkgAcquireStatus *Log = 0); + + /** \brief Destroy this pkgAcquire object. + * + * Destroys all queue, method, and item objects associated with + * this download. + */ virtual ~pkgAcquire(); }; -// Description of an Item+URI +/** \brief Represents a single download source from which an item + * should be downloaded. + * + * An item may have several assocated ItemDescs over its lifetime. + */ struct pkgAcquire::ItemDesc { + /** \brief The URI from which to download this item. */ string URI; + /** brief A description of this item. */ string Description; + /** brief A shorter description of this item. */ string ShortDesc; + /** brief The underlying item which is to be downloaded. */ Item *Owner; }; -// List of possible items queued for download. +/** \brief A single download queue in a pkgAcquire object. + * + * \todo Why so many protected values? + */ class pkgAcquire::Queue { friend class pkgAcquire; friend class pkgAcquire::UriIterator; friend class pkgAcquire::Worker; + + /** \brief The next queue in the pkgAcquire object's list of queues. */ Queue *Next; protected: - // Queued item + /** \brief A single item placed in this queue. */ struct QItem : pkgAcquire::ItemDesc { - QItem *Next; + /** \brief The next item in the queue. */ + QItem *Next; + /** \brief The worker associated with this item, if any. */ pkgAcquire::Worker *Worker; - + + /** \brief Assign the ItemDesc portion of this QItem from + * another ItemDesc + */ void operator =(pkgAcquire::ItemDesc const &I) { URI = I.URI; @@ -160,45 +405,141 @@ class pkgAcquire::Queue }; }; - // Name of the queue + /** \brief The name of this queue. */ string Name; - // Items queued into this queue + /** \brief The head of the list of items contained in this queue. + * + * \todo why a by-hand list instead of an STL structure? + */ QItem *Items; + + /** \brief The head of the list of workers associated with this queue. + * + * \todo This is plural because support exists in Queue for + * multiple workers. However, it does not appear that there is + * any way to actually associate more than one worker with a + * queue. + * + * \todo Why not just use a std::set? + */ pkgAcquire::Worker *Workers; + + /** \brief the download scheduler with which this queue is associated. */ pkgAcquire *Owner; + + /** \brief The number of entries in this queue that are currently + * being downloaded. + */ signed long PipeDepth; + + /** \brief The maximum number of entries that this queue will + * attempt to download at once. + */ unsigned long MaxPipeDepth; public: - // Put an item into this queue + /** \brief Insert the given fetch request into this queue. */ void Enqueue(ItemDesc &Item); + + /** \brief Remove all fetch requests for the given item from this queue. + * + * \return \b true if at least one request was removed from the queue. + */ bool Dequeue(Item *Owner); - // Find a Queued item + /** \brief Locate an item in this queue. + * + * \param URI A URI to match against. + * \param Owner A pkgAcquire::Worker to match against. + * + * \return the first item in the queue whose URI is #URI and that + * is being downloaded by #Owner. + */ QItem *FindItem(string URI,pkgAcquire::Worker *Owner); + + /** Presumably this should start downloading an item? + * + * \todo Unimplemented. Implement it or remove? + */ bool ItemStart(QItem *Itm,unsigned long Size); + + /** \brief Remove the given item from this queue and set its state + * to pkgAcquire::Item::StatDone. + * + * If this is the only queue containing the item, the item is also + * removed from the main queue by calling pkgAcquire::Dequeue. + * + * \param Itm The item to remove. + * + * \return \b true if no errors are encountered. + */ bool ItemDone(QItem *Itm); + /** \brief Start the worker process associated with this queue. + * + * If a worker process is already associated with this queue, + * this is equivalent to calling Cycle(). + * + * \return \b true if the startup was successful. + */ bool Startup(); + + /** \brief Shut down the worker process associated with this queue. + * + * \param Final If \b true, then the process is stopped unconditionally. + * Otherwise, it is only stopped if it does not need cleanup + * as indicated by the pkgAcqMethod::NeedsCleanup member of + * its configuration. + * + * \return \b true. + */ bool Shutdown(bool Final); + + /** \brief Send idle items to the worker process. + * + * Fills up the pipeline by inserting idle items into the worker's queue. + */ bool Cycle(); + + /** \brief Check for items that could be enqueued. + * + * Call this after an item placed in multiple queues has gone from + * the pkgAcquire::Item::StatFetching state to the + * pkgAcquire::Item::StatIdle state, to possibly refill an empty queue. + * This is an alias for Cycle(). + * + * \todo Why both this and Cycle()? Are they expected to be + * different someday? + */ void Bump(); + /** \brief Create a new Queue. + * + * \param Name The name of the new queue. + * \param Owner The download process that owns the new queue. + */ Queue(string Name,pkgAcquire *Owner); + + /** Shut down all the worker processes associated with this queue + * and empty the queue. + */ ~Queue(); }; +/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */ class pkgAcquire::UriIterator { + /** The next queue to iterate over. */ pkgAcquire::Queue *CurQ; + /** The item that we currently point at. */ pkgAcquire::Queue::QItem *CurItem; public: - // Advance to the next item inline void operator ++() {operator ++();}; + void operator ++(int) { CurItem = CurItem->Next; @@ -209,11 +550,14 @@ class pkgAcquire::UriIterator } }; - // Accessors inline pkgAcquire::ItemDesc const *operator ->() const {return CurItem;}; inline bool operator !=(UriIterator const &rhs) const {return rhs.CurQ != CurQ || rhs.CurItem != CurItem;}; inline bool operator ==(UriIterator const &rhs) const {return rhs.CurQ == CurQ && rhs.CurItem == CurItem;}; + /** \brief Create a new UriIterator. + * + * \param Q The queue over which this UriIterator should iterate. + */ UriIterator(pkgAcquire::Queue *Q) : CurQ(Q), CurItem(0) { while (CurItem == 0 && CurQ != 0) @@ -224,61 +568,200 @@ class pkgAcquire::UriIterator } }; -// Configuration information from each method +/** \brief Information about the properties of a single acquire method. */ struct pkgAcquire::MethodConfig { + /** \brief The next link on the acquire method list. + * + * \todo Why not an STL container? + */ MethodConfig *Next; + /** \brief The name of this acquire method (e.g., http). */ string Access; + /** \brief The implementation version of this acquire method. */ string Version; + + /** \brief If \b true, only one download queue should be created for this + * method. + */ bool SingleInstance; + + /** \brief If \b true, this method supports pipelined downloading. */ bool Pipeline; + + /** \brief If \b true, the worker process should send the entire + * APT configuration tree to the fetch subprocess when it starts + * up. + */ bool SendConfig; + + /** \brief If \b true, this fetch method does not require network access; + * all files are to be acquired from the local disk. + */ bool LocalOnly; + + /** \brief If \b true, the subprocess has to carry out some cleanup + * actions before shutting down. + * + * For instance, the cdrom method needs to unmount the CD after it + * finishes. + */ bool NeedsCleanup; + + /** \brief If \b true, this fetch method acquires files from removable media. */ bool Removable; + /** \brief Set up the default method parameters. + * + * All fields are initialized to NULL, "", or \b false as + * appropriate. + */ MethodConfig(); }; +/** \brief A monitor object for downloads controlled by the pkgAcquire class. + * + * \todo Why protected members? + * + * \todo Should the double members be uint64_t? + */ class pkgAcquireStatus { protected: + /** \brief The last time at which this monitor object was updated. */ struct timeval Time; + + /** \brief The time at which the download started. */ struct timeval StartTime; + + /** \brief The number of bytes fetched as of the previous call to + * pkgAcquireStatus::Pulse, including local items. + */ double LastBytes; + + /** \brief The current rate of download as of the most recent call + * to pkgAcquireStatus::Pulse, in bytes per second. + */ double CurrentCPS; + + /** \brief The number of bytes fetched as of the most recent call + * to pkgAcquireStatus::Pulse, including local items. + */ double CurrentBytes; + + /** \brief The total number of bytes that need to be fetched. + * + * \warning This member is inaccurate, as new items might be + * enqueued while the download is in progress! + */ double TotalBytes; + + /** \brief The total number of bytes accounted for by items that + * were successfully fetched. + */ double FetchedBytes; + + /** \brief The amount of time that has elapsed since the download + * started. + */ unsigned long ElapsedTime; + + /** \brief The total number of items that need to be fetched. + * + * \warning This member is inaccurate, as new items might be + * enqueued while the download is in progress! + */ unsigned long TotalItems; + + /** \brief The number of items that have been successfully downloaded. */ unsigned long CurrentItems; public: + /** \brief If \b true, the download scheduler should call Pulse() + * at the next available opportunity. + */ bool Update; + + /** \brief If \b true, extra Pulse() invocations will be performed. + * + * With this option set, Pulse() will be called every time that a + * download item starts downloading, finishes downloading, or + * terminates with an error. + */ bool MorePulses; - // Called by items when they have finished a real download + /** \brief Invoked when a local or remote file has been completely fetched. + * + * \param Size The size of the file fetched. + * + * \param ResumePoint How much of the file was already fetched. + */ virtual void Fetched(unsigned long Size,unsigned long ResumePoint); - // Called to change media + /** \brief Invoked when the user should be prompted to change the + * inserted removable media. + * + * This method should not return until the user has confirmed to + * the user interface that the media change is complete. + * + * \param Media The name of the media type that should be changed. + * + * \param Drive The identifying name of the drive whose media + * should be changed. + * + * \return \b true if the user confirms the media change, \b + * false if it is cancelled. + * + * \todo This is a horrible blocking monster; it should be CPSed + * with prejudice. + */ virtual bool MediaChange(string Media,string Drive) = 0; - // Each of these is called by the workers when an event occures + /** \brief Invoked when an item is confirmed to be up-to-date. + + * For instance, when an HTTP download is informed that the file on + * the server was not modified. + */ virtual void IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when some of an item's data is fetched. */ virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when an item is successfully and completely fetched. */ virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when the process of fetching an item encounters + * a fatal error. + */ virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {}; - virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel + + /** \brief Periodically invoked while the Acquire process is underway. + * + * Subclasses should first call pkgAcquireStatus::Pulse(), then + * update their status output. The download process is blocked + * while Pulse() is being called. + * + * \return \b false if the user asked to cancel the whole Acquire process. + * + * \see pkgAcquire::Run + */ + virtual bool Pulse(pkgAcquire *Owner); + + /** \brief Invoked when the Acquire process starts running. */ virtual void Start(); + + /** \brief Invoked when the Acquire process stops running. */ virtual void Stop(); + /** \brief Initialize all counters to 0 and the time to the current time. */ pkgAcquireStatus(); virtual ~pkgAcquireStatus() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 479927d65..ac9d3be0b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -20,10 +20,12 @@ #include <apt-pkg/algorithms.h> #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/version.h> #include <apt-pkg/sptr.h> + #include <apti18n.h> - +#include <sys/types.h> #include <iostream> /*}}}*/ using namespace std; @@ -220,6 +222,8 @@ void pkgSimulate::ShortBreaks() the necessary calculations to deal with the problems. */ bool pkgApplyStatus(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (I->VersionList == 0) @@ -230,13 +234,13 @@ bool pkgApplyStatus(pkgDepCache &Cache) I->InstState == pkgCache::State::HoldReInstReq) { if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { // Is this right? Will dpkg choke on an upgrade? if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, false, 0, false); else return _error->Error(_("The package %s needs to be reinstalled, " "but I can't find an archive for it."),I.Name()); @@ -253,12 +257,12 @@ bool pkgApplyStatus(pkgDepCache &Cache) case pkgCache::State::HalfConfigured: if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) || I.State() != pkgCache::PkgIterator::NeedsUnpack) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, true, 0, false); else Cache.MarkDelete(I); } @@ -284,10 +288,12 @@ bool pkgApplyStatus(pkgDepCache &Cache) on the result. */ bool pkgFixBroken(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + // Auto upgrade all broken packages for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (Cache[I].NowBroken() == true) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Fix packages that are in a NeedArchive state but don't have a downloadable install version */ @@ -300,7 +306,7 @@ bool pkgFixBroken(pkgDepCache &Cache) if (Cache[I].InstVerIter(Cache).Downloadable() == false) continue; - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); } pkgProblemResolver Fix(&Cache); @@ -317,23 +323,25 @@ bool pkgFixBroken(pkgDepCache &Cache) */ bool pkgDistUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + /* Auto upgrade all installed packages, this provides the basis for the installation */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Now, auto upgrade all essential packages - this ensures that the essential packages are present and working */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* We do it again over all previously installed packages to force conflict resolution on them all. */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); pkgProblemResolver Fix(&Cache); @@ -345,7 +353,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache) if (I->SelectedState == pkgCache::State::Hold) { Fix.Protect(I); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } } } @@ -360,6 +368,8 @@ bool pkgDistUpgrade(pkgDepCache &Cache) to install packages not marked for install */ bool pkgAllUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + pkgProblemResolver Fix(&Cache); if (Cache.BrokenCount() != 0) @@ -376,7 +386,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache) continue; if (I->CurrentVer != 0 && Cache[I].InstallVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); } return Fix.ResolveByKeep(); @@ -389,6 +399,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache) the package is restored. */ bool pkgMinimizeUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + if (Cache.BrokenCount() != 0) return false; @@ -405,9 +417,9 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) continue; // Keep it and see if that is OK - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache.BrokenCount() != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); else { // If keep didnt actually do anything then there was no change.. @@ -565,6 +577,8 @@ void pkgProblemResolver::MakeScores() installable */ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) { + pkgDepCache::ActionGroup group(Cache); + if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false) return false; if ((Flags[Pkg->ID] & Protected) == Protected) @@ -573,7 +587,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) Flags[Pkg->ID] &= ~Upgradable; bool WasKept = Cache[Pkg].Keep(); - Cache.MarkInstall(Pkg,false); + Cache.MarkInstall(Pkg, false, 0, false); // This must be a virtual package or something like that. if (Cache[Pkg].InstVerIter(Cache).end() == true) @@ -658,7 +672,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) if (Fail == true) { if (WasKept == true) - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); else Cache.MarkDelete(Pkg); return false; @@ -685,6 +699,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) upgrade packages to advoid problems. */ bool pkgProblemResolver::Resolve(bool BrokenFix) { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; // Record which packages are marked for install @@ -700,7 +716,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Cache[I].InstBroken() == true && BrokenFix == true) { - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].Install() == true) Again = true; } @@ -766,14 +782,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::Version *OldVer = Cache[I].InstallVer; Flags[I->ID] &= ReInstateTried; - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].InstBroken() == true || OldBreaks < Cache.BrokenCount()) { if (OldVer == 0) Cache.MarkDelete(I); else - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } else if (Debug == true) @@ -818,7 +834,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Or group keep for " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); Change = true; } } @@ -868,7 +884,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } Change = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); break; } @@ -905,7 +921,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) /* See if a keep will do, unless the package is protected, then installing it will be necessary */ bool Installed = Cache[I].Install(); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { // Unwind operation will be keep now @@ -914,7 +930,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; @@ -986,7 +1002,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl; @@ -1031,7 +1047,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl; - Cache.MarkKeep(J->Pkg); + Cache.MarkKeep(J->Pkg, false, false); } if (Counter > 1) @@ -1061,6 +1077,20 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) return _error->Error(_("Unable to correct problems, you have held broken packages.")); } + // set the auto-flags (mvo: I'm not sure if we _really_ need this, but + // I didn't managed + pkgCache::PkgIterator I = Cache.PkgBegin(); + for (;I.end() != true; I++) { + if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { + if(_config->FindI("Debug::pkgAutoRemove",false)) { + std::clog << "Resolve installed new pkg: " << I.Name() + << " (now marking it as auto)" << std::endl; + } + Cache[I].Flags |= pkgCache::Flag::Auto; + } + } + + return true; } /*}}}*/ @@ -1071,6 +1101,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeep() { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; if (Debug == true) @@ -1104,7 +1136,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << "Keeping package " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { K = PList - 1; @@ -1152,7 +1184,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl; - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); } if (Cache[I].InstBroken() == false) @@ -1189,6 +1221,8 @@ bool pkgProblemResolver::ResolveByKeep() /* This is used to make sure protected packages are installed */ void pkgProblemResolver::InstallProtect() { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if ((Flags[I->ID] & Protected) == Protected) @@ -1196,7 +1230,7 @@ void pkgProblemResolver::InstallProtect() if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); else - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); } } } @@ -1232,3 +1266,4 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) qsort(List,Count,sizeof(*List),PrioComp); } /*}}}*/ + diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 64fa4636e..d5a9c7b0d 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -107,7 +107,7 @@ class pkgCache::VerIterator // Iteration void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;}; inline void operator ++() {operator ++(0);}; - inline bool end() const {return Ver == Owner->VerP?true:false;}; + inline bool end() const {return Owner == NULL || (Ver == Owner->VerP?true:false);}; inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;}; // Comparison diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 09e454be9..14a000fa5 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -110,7 +110,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S, return 0; I = new Item; - I->Tag = string(S,Len); + I->Tag.assign(S,Len); I->Next = *Last; I->Parent = Head; *Last = I; @@ -161,7 +161,7 @@ string Configuration::Find(const char *Name,const char *Default) const if (Itm == 0 || Itm->Value.empty() == true) { if (Default == 0) - return string(); + return ""; else return Default; } @@ -180,7 +180,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const if (Itm == 0 || Itm->Value.empty() == true) { if (Default == 0) - return string(); + return ""; else return Default; } @@ -294,7 +294,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const // Configuration::CndSet - Conditinal Set a value /*{{{*/ // --------------------------------------------------------------------- /* This will not overwrite */ -void Configuration::CndSet(const char *Name,string Value) +void Configuration::CndSet(const char *Name,const string &Value) { Item *Itm = Lookup(Name,true); if (Itm == 0) @@ -306,7 +306,7 @@ void Configuration::CndSet(const char *Name,string Value) // Configuration::Set - Set a value /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Set(const char *Name,string Value) +void Configuration::Set(const char *Name,const string &Value) { Item *Itm = Lookup(Name,true); if (Itm == 0) @@ -330,7 +330,7 @@ void Configuration::Set(const char *Name,int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(string Name, int Value) +void Configuration::Clear(const string Name, int Value) { char S[300]; snprintf(S,sizeof(S),"%i",Value); @@ -340,7 +340,7 @@ void Configuration::Clear(string Name, int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(string Name, string Value) +void Configuration::Clear(const string Name, string Value) { Item *Top = Lookup(Name.c_str(),false); if (Top == 0 || Top->Child == 0) @@ -377,7 +377,7 @@ void Configuration::Clear(string Name) if (Top == 0) return; - Top->Value = string(); + Top->Value.clear(); Item *Stop = Top; Top = Top->Child; Stop->Child = 0; @@ -485,7 +485,7 @@ string Configuration::Item::FullTag(const Item *Stop) const sections like 'zone "foo.org" { .. };' This causes each section to be added in with a tag like "zone::foo.org" instead of being split tag/value. AsSectional enables Sectional parsing.*/ -bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, +bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, unsigned Depth) { // Open the stream for reading @@ -711,13 +711,13 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, } // Empty the buffer - LineBuffer = string(); + LineBuffer.clear(); // Move up a tag, but only if there is no bit to parse if (TermChar == '}') { if (StackPos == 0) - ParentTag = string(); + ParentTag.clear(); else ParentTag = Stack[--StackPos]; } @@ -742,8 +742,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, // ReadConfigDir - Read a directory of config files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional, - unsigned Depth) +bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional, + unsigned Depth) { DIR *D = opendir(Dir.c_str()); if (D == 0) diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 789bc82cf..0d4078dab 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -69,30 +69,30 @@ class Configuration public: string Find(const char *Name,const char *Default = 0) const; - string Find(string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; + string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; string FindFile(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const; int FindI(const char *Name,int Default = 0) const; - int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; + int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool Default = false) const; - bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);}; + bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);}; string FindAny(const char *Name,const char *Default = 0) const; - inline void Set(string Name,string Value) {Set(Name.c_str(),Value);}; - void CndSet(const char *Name,string Value); - void Set(const char *Name,string Value); + inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);}; + void CndSet(const char *Name,const string &Value); + void Set(const char *Name,const string &Value); void Set(const char *Name,int Value); - inline bool Exists(string Name) const {return Exists(Name.c_str());}; + inline bool Exists(const string Name) const {return Exists(Name.c_str());}; bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; // clear a whole tree - void Clear(string Name); + void Clear(const string Name); // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") - void Clear(string List, string Value); - void Clear(string List, int Value); + void Clear(const string List, string Value); + void Clear(const string List, int Value); inline const Item *Tree(const char *Name) const {return Lookup(Name);}; @@ -106,10 +106,12 @@ class Configuration extern Configuration *_config; -bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional = false, +bool ReadConfigFile(Configuration &Conf,const string &FName, + bool AsSectional = false, unsigned Depth = 0); -bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional = false, - unsigned Depth = 0); +bool ReadConfigDir(Configuration &Conf,const string &Dir, + bool AsSectional = false, + unsigned Depth = 0); #endif diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index b17b94319..9b22a90d3 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -36,6 +36,7 @@ bool Hashes::AddFD(int Fd,unsigned long Size) Size -= Res; MD5.Add(Buf,Res); SHA1.Add(Buf,Res); + SHA256.Add(Buf,Res); } return true; } diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 40bbe00a0..eefa7bf41 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -19,6 +19,7 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <algorithm> @@ -30,10 +31,11 @@ class Hashes MD5Summation MD5; SHA1Summation SHA1; + SHA256Summation SHA256; inline bool Add(const unsigned char *Data,unsigned long Size) { - return MD5.Add(Data,Size) && SHA1.Add(Data,Size); + return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size); }; inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; bool AddFD(int Fd,unsigned long Size); diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 9447e9956..e280d714e 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -29,6 +29,7 @@ #include <string> #include <algorithm> +#include <stdint.h> using std::string; using std::min; diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index caffa0f90..e329b167a 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -94,7 +94,7 @@ class DynamicMMap : public MMap unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0); unsigned long Allocate(unsigned long ItemSize); unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1); - inline unsigned long WriteString(string S) {return WriteString(S.c_str(),S.length());}; + inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());}; void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;}; DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024); diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 8eb36fc20..cb272e389 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -50,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur) // --------------------------------------------------------------------- /* */ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, - unsigned long Size,string Op) + unsigned long Size,const string &Op) { this->Current = Current; this->Total = Total; @@ -67,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, // OpProgress::SubProgress - Set the sub progress state /*{{{*/ // --------------------------------------------------------------------- /* */ -void OpProgress::SubProgress(unsigned long SubTotal,string Op) +void OpProgress::SubProgress(unsigned long SubTotal,const string &Op) { this->SubTotal = SubTotal; SubOp = Op; diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index d0b1f5f94..20caf4cdf 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -59,9 +59,9 @@ class OpProgress void Progress(unsigned long Current); void SubProgress(unsigned long SubTotal); - void SubProgress(unsigned long SubTotal,string Op); + void SubProgress(unsigned long SubTotal,const string &Op); void OverallProgress(unsigned long Current,unsigned long Total, - unsigned long Size,string Op); + unsigned long Size,const string &Op); virtual void Done() {}; OpProgress(); diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc new file mode 100644 index 000000000..ad2ddb2d3 --- /dev/null +++ b/apt-pkg/contrib/sha256.cc @@ -0,0 +1,424 @@ +/* + * Cryptographic API. + * + * SHA-256, as specified in + * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf + * + * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>. + * + * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com> + * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> + * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> + * + * Ported from the Linux kernel to Apt by Anthony Towns <ajt@debian.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + */ +#define SHA256_DIGEST_SIZE 32 +#define SHA256_HMAC_BLOCK_SIZE 64 + +#define ror32(value,bits) (((value) >> (bits)) | ((value) << (32 - (bits)))) + +#include <apt-pkg/sha256.h> +#include <apt-pkg/strutl.h> +#include <string.h> +#include <unistd.h> +#include <stdint.h> +#include <stdlib.h> +#include <stdio.h> +#include <arpa/inet.h> + +typedef uint32_t u32; +typedef uint8_t u8; + +static inline u32 Ch(u32 x, u32 y, u32 z) +{ + return z ^ (x & (y ^ z)); +} + +static inline u32 Maj(u32 x, u32 y, u32 z) +{ + return (x & y) | (z & (x | y)); +} + +#define e0(x) (ror32(x, 2) ^ ror32(x,13) ^ ror32(x,22)) +#define e1(x) (ror32(x, 6) ^ ror32(x,11) ^ ror32(x,25)) +#define s0(x) (ror32(x, 7) ^ ror32(x,18) ^ (x >> 3)) +#define s1(x) (ror32(x,17) ^ ror32(x,19) ^ (x >> 10)) + +#define H0 0x6a09e667 +#define H1 0xbb67ae85 +#define H2 0x3c6ef372 +#define H3 0xa54ff53a +#define H4 0x510e527f +#define H5 0x9b05688c +#define H6 0x1f83d9ab +#define H7 0x5be0cd19 + +static inline void LOAD_OP(int I, u32 *W, const u8 *input) +{ + W[I] = ( ((u32) input[I + 0] << 24) + | ((u32) input[I + 1] << 16) + | ((u32) input[I + 2] << 8) + | ((u32) input[I + 3])); +} + +static inline void BLEND_OP(int I, u32 *W) +{ + W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16]; +} + +static void sha256_transform(u32 *state, const u8 *input) +{ + u32 a, b, c, d, e, f, g, h, t1, t2; + u32 W[64]; + int i; + + /* load the input */ + for (i = 0; i < 16; i++) + LOAD_OP(i, W, input); + + /* now blend */ + for (i = 16; i < 64; i++) + BLEND_OP(i, W); + + /* load the state into our registers */ + a=state[0]; b=state[1]; c=state[2]; d=state[3]; + e=state[4]; f=state[5]; g=state[6]; h=state[7]; + + /* now iterate */ + t1 = h + e1(e) + Ch(e,f,g) + 0x428a2f98 + W[ 0]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x71374491 + W[ 1]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xb5c0fbcf + W[ 2]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xe9b5dba5 + W[ 3]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x3956c25b + W[ 4]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x59f111f1 + W[ 5]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x923f82a4 + W[ 6]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xab1c5ed5 + W[ 7]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xd807aa98 + W[ 8]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x12835b01 + W[ 9]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x243185be + W[10]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x550c7dc3 + W[11]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x72be5d74 + W[12]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x80deb1fe + W[13]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x9bdc06a7 + W[14]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xc19bf174 + W[15]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xe49b69c1 + W[16]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xefbe4786 + W[17]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x0fc19dc6 + W[18]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x240ca1cc + W[19]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x2de92c6f + W[20]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x4a7484aa + W[21]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x5cb0a9dc + W[22]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x76f988da + W[23]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x983e5152 + W[24]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xa831c66d + W[25]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xb00327c8 + W[26]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xbf597fc7 + W[27]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0xc6e00bf3 + W[28]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xd5a79147 + W[29]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x06ca6351 + W[30]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x14292967 + W[31]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x27b70a85 + W[32]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x2e1b2138 + W[33]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x4d2c6dfc + W[34]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x53380d13 + W[35]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x650a7354 + W[36]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x766a0abb + W[37]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x81c2c92e + W[38]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x92722c85 + W[39]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xa2bfe8a1 + W[40]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xa81a664b + W[41]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xc24b8b70 + W[42]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xc76c51a3 + W[43]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0xd192e819 + W[44]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xd6990624 + W[45]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0xf40e3585 + W[46]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x106aa070 + W[47]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x19a4c116 + W[48]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x1e376c08 + W[49]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x2748774c + W[50]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x34b0bcb5 + W[51]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x391c0cb3 + W[52]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x4ed8aa4a + W[53]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x5b9cca4f + W[54]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x682e6ff3 + W[55]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x748f82ee + W[56]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x78a5636f + W[57]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x84c87814 + W[58]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x8cc70208 + W[59]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x90befffa + W[60]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xa4506ceb + W[61]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0xbef9a3f7 + W[62]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xc67178f2 + W[63]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + state[0] += a; state[1] += b; state[2] += c; state[3] += d; + state[4] += e; state[5] += f; state[6] += g; state[7] += h; + + /* clear any sensitive info... */ + a = b = c = d = e = f = g = h = t1 = t2 = 0; + memset(W, 0, 64 * sizeof(u32)); +} + +SHA256Summation::SHA256Summation() +{ + Sum.state[0] = H0; + Sum.state[1] = H1; + Sum.state[2] = H2; + Sum.state[3] = H3; + Sum.state[4] = H4; + Sum.state[5] = H5; + Sum.state[6] = H6; + Sum.state[7] = H7; + Sum.count[0] = Sum.count[1] = 0; + memset(Sum.buf, 0, sizeof(Sum.buf)); + Done = false; +} + +bool SHA256Summation::Add(const u8 *data, unsigned long len) +{ + struct sha256_ctx *sctx = ∑ + unsigned int i, index, part_len; + + if (Done) return false; + + /* Compute number of bytes mod 128 */ + index = (unsigned int)((sctx->count[0] >> 3) & 0x3f); + + /* Update number of bits */ + if ((sctx->count[0] += (len << 3)) < (len << 3)) { + sctx->count[1]++; + sctx->count[1] += (len >> 29); + } + + part_len = 64 - index; + + /* Transform as many times as possible. */ + if (len >= part_len) { + memcpy(&sctx->buf[index], data, part_len); + sha256_transform(sctx->state, sctx->buf); + + for (i = part_len; i + 63 < len; i += 64) + sha256_transform(sctx->state, &data[i]); + index = 0; + } else { + i = 0; + } + + /* Buffer remaining input */ + memcpy(&sctx->buf[index], &data[i], len-i); + + return true; +} + +SHA256SumValue SHA256Summation::Result() +{ + struct sha256_ctx *sctx = ∑ + if (!Done) { + u8 bits[8]; + unsigned int index, pad_len, t; + static const u8 padding[64] = { 0x80, }; + + /* Save number of bits */ + t = sctx->count[0]; + bits[7] = t; t >>= 8; + bits[6] = t; t >>= 8; + bits[5] = t; t >>= 8; + bits[4] = t; + t = sctx->count[1]; + bits[3] = t; t >>= 8; + bits[2] = t; t >>= 8; + bits[1] = t; t >>= 8; + bits[0] = t; + + /* Pad out to 56 mod 64. */ + index = (sctx->count[0] >> 3) & 0x3f; + pad_len = (index < 56) ? (56 - index) : ((64+56) - index); + Add(padding, pad_len); + + /* Append length (before padding) */ + Add(bits, 8); + } + + Done = true; + + /* Store state in digest */ + + SHA256SumValue res; + u8 *out = res.Sum; + + int i, j; + unsigned int t; + for (i = j = 0; i < 8; i++, j += 4) { + t = sctx->state[i]; + out[j+3] = t; t >>= 8; + out[j+2] = t; t >>= 8; + out[j+1] = t; t >>= 8; + out[j ] = t; + } + + return res; +} + +// SHA256SumValue::SHA256SumValue - Constructs the sum from a string /*{{{*/ +// --------------------------------------------------------------------- +/* The string form of a SHA256 is a 64 character hex number */ +SHA256SumValue::SHA256SumValue(string Str) +{ + memset(Sum,0,sizeof(Sum)); + Set(Str); +} + + /*}}}*/ +// SHA256SumValue::SHA256SumValue - Default constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Sets the value to 0 */ +SHA256SumValue::SHA256SumValue() +{ + memset(Sum,0,sizeof(Sum)); +} + + /*}}}*/ +// SHA256SumValue::Set - Set the sum from a string /*{{{*/ +// --------------------------------------------------------------------- +/* Converts the hex string into a set of chars */ +bool SHA256SumValue::Set(string Str) +{ + return Hex2Num(Str,Sum,sizeof(Sum)); +} + /*}}}*/ +// SHA256SumValue::Value - Convert the number into a string /*{{{*/ +// --------------------------------------------------------------------- +/* Converts the set of chars into a hex string in lower case */ +string SHA256SumValue::Value() const +{ + char Conv[16] = + { '0','1','2','3','4','5','6','7','8','9','a','b', + 'c','d','e','f' + }; + char Result[65]; + Result[64] = 0; + + // Convert each char into two letters + int J = 0; + int I = 0; + for (; I != 64; J++,I += 2) + { + Result[I] = Conv[Sum[J] >> 4]; + Result[I + 1] = Conv[Sum[J] & 0xF]; + } + + return string(Result); +} + + + +// SHA256SumValue::operator == - Comparator /*{{{*/ +// --------------------------------------------------------------------- +/* Call memcmp on the buffer */ +bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const +{ + return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0; +} + /*}}}*/ + + +// SHA256Summation::AddFD - Add content of file into the checksum /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool SHA256Summation::AddFD(int Fd,unsigned long Size) +{ + unsigned char Buf[64 * 64]; + int Res = 0; + int ToEOF = (Size == 0); + while (Size != 0 || ToEOF) + { + unsigned n = sizeof(Buf); + if (!ToEOF) n = min(Size,(unsigned long)n); + Res = read(Fd,Buf,n); + if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read + return false; + if (ToEOF && Res == 0) // EOF + break; + Size -= Res; + Add(Buf,Res); + } + return true; +} + /*}}}*/ + diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h new file mode 100644 index 000000000..9e88f5ece --- /dev/null +++ b/apt-pkg/contrib/sha256.h @@ -0,0 +1,75 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $ +/* ###################################################################### + + SHA256SumValue - Storage for a SHA-256 hash. + SHA256Summation - SHA-256 Secure Hash Algorithm. + + This is a C++ interface to a set of SHA256Sum functions, that mirrors + the equivalent MD5 & SHA1 classes. + + ##################################################################### */ + /*}}}*/ +#ifndef APTPKG_SHA256_H +#define APTPKG_SHA256_H + +#ifdef __GNUG__ +#pragma interface "apt-pkg/sha256.h" +#endif + +#include <string> +#include <algorithm> +#include <stdint.h> + +using std::string; +using std::min; + +class SHA256Summation; + +class SHA256SumValue +{ + friend class SHA256Summation; + unsigned char Sum[32]; + + public: + + // Accessors + bool operator ==(const SHA256SumValue &rhs) const; + string Value() const; + inline void Value(unsigned char S[32]) + {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];}; + inline operator string() const {return Value();}; + bool Set(string Str); + inline void Set(unsigned char S[32]) + {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];}; + + SHA256SumValue(string Str); + SHA256SumValue(); +}; + +struct sha256_ctx { + uint32_t count[2]; + uint32_t state[8]; + uint8_t buf[128]; +}; + +class SHA256Summation +{ + struct sha256_ctx Sum; + + bool Done; + + public: + + bool Add(const unsigned char *inbuf,unsigned long inlen); + inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; + bool AddFD(int Fd,unsigned long Size); + inline bool Add(const unsigned char *Beg,const unsigned char *End) + {return Add(Beg,End-Beg);}; + SHA256SumValue Result(); + + SHA256Summation(); +}; + +#endif diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 303cb27db..37d263794 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -242,10 +242,10 @@ bool ParseCWord(const char *&String,string &Res) // QuoteString - Convert a string into quoted from /*{{{*/ // --------------------------------------------------------------------- /* */ -string QuoteString(string Str,const char *Bad) +string QuoteString(const string &Str, const char *Bad) { string Res; - for (string::iterator I = Str.begin(); I != Str.end(); I++) + for (string::const_iterator I = Str.begin(); I != Str.end(); I++) { if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || *I <= 0x20 || *I >= 0x7F) @@ -263,7 +263,7 @@ string QuoteString(string Str,const char *Bad) // DeQuoteString - Convert a string from quoted from /*{{{*/ // --------------------------------------------------------------------- /* This undoes QuoteString */ -string DeQuoteString(string Str) +string DeQuoteString(const string &Str) { string Res; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) @@ -360,7 +360,7 @@ string TimeToStr(unsigned long Sec) // SubstVar - Substitute a string for another string /*{{{*/ // --------------------------------------------------------------------- /* This replaces all occurances of Subst with Contents in Str. */ -string SubstVar(string Str,string Subst,string Contents) +string SubstVar(const string &Str,const string &Subst,const string &Contents) { string::size_type Pos = 0; string::size_type OldPos = 0; @@ -391,21 +391,18 @@ string SubstVar(string Str,const struct SubstVar *Vars) /* This converts a URI into a safe filename. It quotes all unsafe characters and converts / to _ and removes the scheme identifier. The resulting file name should be unique and never occur again for a different file */ -string URItoFileName(string URI) +string URItoFileName(const string &URI) { // Nuke 'sensitive' items ::URI U(URI); - U.User = string(); - U.Password = string(); - U.Access = ""; + U.User.clear(); + U.Password.clear(); + U.Access.clear(); // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; - URI = QuoteString(U,"\\|{}[]<>\"^~=!@#$%^&*"); - string::iterator J = URI.begin(); - for (; J != URI.end(); J++) - if (*J == '/') - *J = '_'; - return URI; + string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); + replace(NewURI.begin(),NewURI.end(),'/','_'); + return NewURI; } /*}}}*/ // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ @@ -414,7 +411,7 @@ string URItoFileName(string URI) from wget and then patched and bug fixed. This spec can be found in rfc2045 */ -string Base64Encode(string S) +string Base64Encode(const string &S) { // Conversion table. static char tbl[64] = {'A','B','C','D','E','F','G','H', @@ -583,17 +580,17 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, // --------------------------------------------------------------------- /* The format is like those used in package files and the method communication system */ -string LookupTag(string Message,const char *Tag,const char *Default) +string LookupTag(const string &Message,const char *Tag,const char *Default) { // Look for a matching tag. int Length = strlen(Tag); - for (string::iterator I = Message.begin(); I + Length < Message.end(); I++) + for (string::const_iterator I = Message.begin(); I + Length < Message.end(); I++) { // Found the tag if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0) { // Find the end of line and strip the leading/trailing spaces - string::iterator J; + string::const_iterator J; I += Length + 1; for (; isspace(*I) != 0 && I < Message.end(); I++); for (J = I; *J != '\n' && J < Message.end(); J++); @@ -615,7 +612,7 @@ string LookupTag(string Message,const char *Tag,const char *Default) // --------------------------------------------------------------------- /* This inspects the string to see if it is true or if it is false and then returns the result. Several varients on true/false are checked. */ -int StringToBool(string Text,int Default) +int StringToBool(const string &Text,int Default) { char *End; int Res = strtol(Text.c_str(),&End,0); @@ -781,7 +778,7 @@ static time_t timegm(struct tm *t) 'timegm' to convert a struct tm in UTC to a time_t. For some bizzar reason the C library does not provide any such function :< This also handles the weird, but unambiguous FTP time format*/ -bool StrToTime(string Val,time_t &Result) +bool StrToTime(const string &Val,time_t &Result) { struct tm Tm; char Month[10]; @@ -868,7 +865,7 @@ static int HexDigit(int c) // Hex2Num - Convert a long hex number into a buffer /*{{{*/ // --------------------------------------------------------------------- /* The length of the buffer must be exactly 1/2 the length of the string. */ -bool Hex2Num(string Str,unsigned char *Num,unsigned int Length) +bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length) { if (Str.length() != Length*2) return false; @@ -1029,7 +1026,7 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) // --------------------------------------------------------------------- /* The domain list is a comma seperate list of domains that are suffix matched against the argument */ -bool CheckDomainList(string Host,string List) +bool CheckDomainList(const string &Host,const string &List) { string::const_iterator Start = List.begin(); for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++) @@ -1052,7 +1049,7 @@ bool CheckDomainList(string Host,string List) // URI::CopyFrom - Copy from an object /*{{{*/ // --------------------------------------------------------------------- /* This parses the URI into all of its components */ -void URI::CopyFrom(string U) +void URI::CopyFrom(const string &U) { string::const_iterator I = U.begin(); @@ -1081,9 +1078,9 @@ void URI::CopyFrom(string U) SingleSlash = U.end(); // We can now write the access and path specifiers - Access = string(U,0,FirstColon - U.begin()); + Access.assign(U.begin(),FirstColon); if (SingleSlash != U.end()) - Path = string(U,SingleSlash - U.begin()); + Path.assign(SingleSlash,U.end()); if (Path.empty() == true) Path = "/"; @@ -1113,14 +1110,14 @@ void URI::CopyFrom(string U) if (At == SingleSlash) { if (FirstColon < SingleSlash) - Host = string(U,FirstColon - U.begin(),SingleSlash - FirstColon); + Host.assign(FirstColon,SingleSlash); } else { - Host = string(U,At - U.begin() + 1,SingleSlash - At - 1); - User = string(U,FirstColon - U.begin(),SecondColon - FirstColon); + Host.assign(At+1,SingleSlash); + User.assign(FirstColon,SecondColon); if (SecondColon < At) - Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1); + Password.assign(SecondColon+1,At); } // Now we parse the RFC 2732 [] hostnames. @@ -1148,7 +1145,7 @@ void URI::CopyFrom(string U) // Tsk, weird. if (InBracket == true) { - Host = string(); + Host.clear(); return; } @@ -1159,7 +1156,7 @@ void URI::CopyFrom(string U) return; Port = atoi(string(Host,Pos+1).c_str()); - Host = string(Host,0,Pos); + Host.assign(Host,0,Pos); } /*}}}*/ // URI::operator string - Convert the URI to a string /*{{{*/ @@ -1214,12 +1211,12 @@ URI::operator string() // URI::SiteOnly - Return the schema and site for the URI /*{{{*/ // --------------------------------------------------------------------- /* */ -string URI::SiteOnly(string URI) +string URI::SiteOnly(const string &URI) { ::URI U(URI); - U.User = string(); - U.Password = string(); - U.Path = string(); + U.User.clear(); + U.Password.clear(); + U.Path.clear(); U.Port = 0; return U; } diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 72fc34d6d..254087267 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -44,24 +44,24 @@ char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); bool ParseQuoteWord(const char *&String,string &Res); bool ParseCWord(const char *&String,string &Res); -string QuoteString(string Str,const char *Bad); -string DeQuoteString(string Str); +string QuoteString(const string &Str,const char *Bad); +string DeQuoteString(const string &Str); string SizeToStr(double Bytes); string TimeToStr(unsigned long Sec); -string Base64Encode(string Str); -string URItoFileName(string URI); +string Base64Encode(const string &Str); +string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool StrToTime(string Val,time_t &Result); -string LookupTag(string Message,const char *Tag,const char *Default = 0); -int StringToBool(string Text,int Default = -1); +bool StrToTime(const string &Val,time_t &Result); +string LookupTag(const string &Message,const char *Tag,const char *Default = 0); +int StringToBool(const string &Text,int Default = -1); bool ReadMessages(int Fd, vector<string> &List); bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0); -bool Hex2Num(string Str,unsigned char *Num,unsigned int Length); +bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; -bool CheckDomainList(string Host,string List); +bool CheckDomainList(const string &Host, const string &List); #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ @@ -102,7 +102,7 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);}; class URI { - void CopyFrom(string From); + void CopyFrom(const string &From); public: @@ -114,9 +114,9 @@ class URI unsigned int Port; operator string(); - inline void operator =(string From) {CopyFrom(From);}; + inline void operator =(const string &From) {CopyFrom(From);}; inline bool empty() {return Access.empty();}; - static string SiteOnly(string URI); + static string SiteOnly(const string &URI); URI(string Path) {CopyFrom(Path);}; URI() : Port(0) {}; @@ -128,7 +128,7 @@ struct SubstVar const string *Contents; }; string SubstVar(string Str,const struct SubstVar *Vars); -string SubstVar(string Str,string Subst,string Contents); +string SubstVar(const string &Str,const string &Subst,const string &Contents); struct RxChoiceList { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 97553ab82..c2b26b5eb 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -420,12 +420,12 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, const char *End = I; for (; End > Start && isspace(End[-1]); End--); - Ver = string(Start,End-Start); + Ver.assign(Start,End-Start); I++; } else { - Ver = string(); + Ver.clear(); Op = pkgCache::Dep::NoOp; } @@ -547,11 +547,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) Start = ParseDepends(Start,Stop,Package,Version,Op); if (Start == 0) return _error->Error("Problem parsing Provides line"); - if (Op != pkgCache::Dep::NoOp) - return _error->Error("Malformed provides line"); - - if (NewProvides(Ver,Package,Version) == false) - return false; + if (Op != pkgCache::Dep::NoOp) { + _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); + } else { + if (NewProvides(Ver,Package,Version) == false) + return false; + } if (Start == Stop) break; diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index a3fc39302..8cf31b326 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -175,7 +175,7 @@ bool debReleaseIndex::IsTrusted() const string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; - if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(_config->FindB("APT::Authentication::TrustCDROM", false)) if(URI.substr(0,strlen("cdrom:")) == "cdrom:") return true; diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index aeee61929..064d8fa5b 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -59,7 +59,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd, } /* Iterate over the whole string - What this does is to spilt the whole string into groups of + What this does is to split the whole string into groups of numeric and non numeric portions. For instance: a67bhgs89 Has 4 portions 'a', '67', 'bhgs', '89'. A more normal: @@ -140,6 +140,27 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, if (rhs == BEnd) rhs = B; + // Special case: a zero epoch is the same as no epoch, + // so remove it. + if (lhs != A) + { + for (; *A == '0'; ++A); + if (A == lhs) + { + ++A; + ++lhs; + } + } + if (rhs != B) + { + for (; *B == '0'; ++B); + if (B == rhs) + { + ++B; + ++rhs; + } + } + // Compare the epoch int Res = CmpFragment(A,lhs,B,rhs); if (Res != 0) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fe8fbca74..667db8ff2 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, // Purge operation { - {"config-files", _("Preparing for remove with config %s")}, - {"not-installed", _("Removed with config %s")}, + {"config-files", _("Preparing to completely remove %s")}, + {"not-installed", _("Completely removed %s")}, {NULL, NULL} }, }; @@ -623,8 +623,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited */ - char* list[4]; - TokSplitString(':', line, list, 5); + char* list[5]; + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); char *pkg = list[1]; char *action = _strstrip(list[2]); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 2ff8a9ac7..0b181dc43 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -47,7 +47,7 @@ class pkgDPkgPM : public pkgPackageManager bool RunScripts(const char *Cnf); bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); - + // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index dd1c794c9..369eae70b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -16,15 +16,52 @@ #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> #include <apt-pkg/algorithms.h> - + +#include <apt-pkg/fileutl.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/pkgsystem.h> +#include <apt-pkg/tagfile.h> + +#include <iostream> +#include <sstream> +#include <set> + #include <apti18n.h> - /*}}}*/ + +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : + cache(cache), released(false) +{ + ++cache.group_level; +} + +void pkgDepCache::ActionGroup::release() +{ + if(!released) + { + if(cache.group_level == 0) + std::cerr << "W: Unbalanced action groups, expect badness" << std::endl; + else + { + --cache.group_level; + + if(cache.group_level == 0) + cache.MarkAndSweep(); + } + + released = false; + } +} + +pkgDepCache::ActionGroup::~ActionGroup() +{ + release(); +} // DepCache::pkgDepCache - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) : - Cache(pCache), PkgState(0), DepState(0) + group_level(0), Cache(pCache), PkgState(0), DepState(0) { delLocalPolicy = 0; LocalPolicy = Plcy; @@ -47,6 +84,10 @@ pkgDepCache::~pkgDepCache() /* This allocats the extension buffers and initializes them. */ bool pkgDepCache::Init(OpProgress *Prog) { + // Suppress mark updates during this operation (just in case) and + // run a mark operation when Init terminates. + ActionGroup actions(*this); + delete [] PkgState; delete [] DepState; PkgState = new StateCache[Head().PackageCount]; @@ -72,7 +113,7 @@ bool pkgDepCache::Init(OpProgress *Prog) // Find the proper cache slot StateCache &State = PkgState[I->ID]; State.iFlags = 0; - + // Figure out the install version State.CandidateVer = GetCandidateVer(I); State.InstallVer = I.CurrentVer(); @@ -94,11 +135,130 @@ bool pkgDepCache::Init(OpProgress *Prog) if(Prog != 0) Prog->Done(); - + return true; } /*}}}*/ +bool pkgDepCache::readStateFile(OpProgress *Prog) +{ + FileFd state_file; + string state = _config->FindDir("Dir::State") + "extended_states"; + if(FileExists(state)) { + state_file.Open(state, FileFd::ReadOnly); + int file_size = state_file.Size(); + if(Prog != NULL) + Prog->OverallProgress(0, file_size, 1, + _("Reading state information")); + + pkgTagFile tagfile(&state_file); + pkgTagSection section; + int amt=0; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + // Silently ignore unknown packages and packages with no actual + // version. + if(!pkg.end() && !pkg.VersionList().end()) { + short reason = section.FindI("Auto-Installed", 0); + if(reason > 0) + PkgState[pkg->ID].Flags |= Flag::Auto; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Auto-Installed : " << pkgname << std::endl; + amt+=section.size(); + if(Prog != NULL) + Prog->OverallProgress(amt, file_size, 1, + _("Reading state information")); + } + if(Prog != NULL) + Prog->OverallProgress(file_size, file_size, 1, + _("Reading state information")); + } + } + + return true; +} + +bool pkgDepCache::writeStateFile(OpProgress *prog) +{ + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "pkgDepCache::writeStateFile()" << std::endl; + + FileFd StateFile; + string state = _config->FindDir("Dir::State") + "extended_states"; + + // if it does not exist, create a empty one + if(!FileExists(state)) + { + StateFile.Open(state, FileFd::WriteEmpty); + StateFile.Close(); + } + + // open it + if(!StateFile.Open(state, FileFd::ReadOnly)) + return _error->Error(_("Failed to open StateFile %s"), + state.c_str()); + + FILE *OutFile; + string outfile = state + ".tmp"; + if((OutFile = fopen(outfile.c_str(),"w")) == NULL) + return _error->Error(_("Failed to write temporary StateFile %s"), + outfile.c_str()); + + // first merge with the existing sections + pkgTagFile tagfile(&StateFile); + pkgTagSection section; + std::set<string> pkgs_seen; + const char *nullreorderlist[] = {0}; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + // Silently ignore unknown packages and packages with no actual + // version. + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + if(pkg.end() || pkg.VersionList().end()) + continue; + bool oldAuto = section.FindI("Auto-Installed"); + bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Update exisiting AutoInstall info: " + << pkg.Name() << std::endl; + TFRewriteData rewrite[2]; + rewrite[0].Tag = "Auto-Installed"; + rewrite[0].Rewrite = newAuto ? "1" : "0"; + rewrite[0].NewTag = 0; + rewrite[1].Tag = 0; + TFRewrite(OutFile, section, nullreorderlist, rewrite); + fprintf(OutFile,"\n"); + pkgs_seen.insert(pkgname); + } + + // then write the ones we have not seen yet + std::ostringstream ostr; + for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { + if(PkgState[pkg->ID].Flags & Flag::Auto) { + if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Skipping already written " << pkg.Name() << std::endl; + continue; + } + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Writing new AutoInstall: " + << pkg.Name() << std::endl; + ostr.str(string("")); + ostr << "Package: " << pkg.Name() + << "\nAuto-Installed: 1\n\n"; + fprintf(OutFile,ostr.str().c_str()); + fprintf(OutFile,"\n"); + } + } + fclose(OutFile); + + // move the outfile over the real file + rename(outfile.c_str(), state.c_str()); + + return true; +} + // DepCache::CheckDep - Checks a single dependency /*{{{*/ // --------------------------------------------------------------------- /* This first checks the dependency against the main target package and @@ -452,12 +612,14 @@ void pkgDepCache::Update(OpProgress *Prog) if (Prog != 0) Prog->Progress(Done); + + readStateFile(Prog); } /*}}}*/ // DepCache::Update - Update the deps list of a package /*{{{*/ // --------------------------------------------------------------------- /* This is a helper for update that only does the dep portion of the scan. - It is mainly ment to scan reverse dependencies. */ + It is mainly meant to scan reverse dependencies. */ void pkgDepCache::Update(DepIterator D) { // Update the reverse deps @@ -509,7 +671,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg) // DepCache::MarkKeep - Put the package in the keep state /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) { // Simplifies other routines. if (Pkg.end() == true) @@ -521,6 +683,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) Pkg.CurrentVer().Downloadable() == false) return; + /** \todo Can this be moved later in the method? */ + ActionGroup group(*this); + /* We changed the soft state all the time so the UI is a bit nicer to use */ StateCache &P = PkgState[Pkg->ID]; @@ -537,7 +702,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) if (Pkg->VersionList == 0) return; - P.Flags &= ~Flag::Auto; + if(FromUser && !P.Marked) + P.Flags &= ~Flag::Auto; RemoveSizes(Pkg); RemoveStates(Pkg); @@ -563,6 +729,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) if (Pkg.end() == true) return; + ActionGroup group(*this); + // Check that it is not already marked for delete StateCache &P = PkgState[Pkg->ID]; P.iFlags &= ~(AutoKept | Purge); @@ -585,7 +753,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) else P.Mode = ModeDelete; P.InstallVer = 0; - P.Flags &= Flag::Auto; AddStates(Pkg); Update(Pkg); @@ -596,7 +763,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, - unsigned long Depth) + unsigned long Depth, bool FromUser) { if (Depth > 100) return; @@ -605,6 +772,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (Pkg.end() == true) return; + ActionGroup group(*this); + /* Check that it is not already marked for install and that it can be installed */ StateCache &P = PkgState[Pkg->ID]; @@ -613,7 +782,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) - MarkKeep(Pkg); + MarkKeep(Pkg, false, FromUser); return; } @@ -633,7 +802,20 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.Mode = ModeInstall; P.InstallVer = P.CandidateVer; - P.Flags &= ~Flag::Auto; + + if(FromUser) + { + // Set it to manual if it's a new install or cancelling the + // removal of a garbage package. + if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked)) + P.Flags &= ~Flag::Auto; + } + else + { + // Set it to auto if this is a new install. + if(P.Status == 2) + P.Flags |= Flag::Auto; + } if (P.CandidateVer == (Version *)Pkg.CurrentVer()) P.Mode = ModeKeep; @@ -710,15 +892,14 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - if (InstPkg.end() == false) + if (InstPkg.end() == false) { - MarkInstall(InstPkg,true,Depth + 1); - - // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) - PkgState[InstPkg->ID].Flags |= Flag::Auto; + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "Installing " << InstPkg.Name() + << " as dep of " << Pkg.Name() + << std::endl; + MarkInstall(InstPkg, true, Depth + 1, false); } - continue; } @@ -732,7 +913,6 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgIterator Pkg = Ver.ParentPkg(); MarkDelete(Pkg); - PkgState[Pkg->ID].Flags |= Flag::Auto; } continue; } @@ -744,6 +924,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + ActionGroup group(*this); + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -762,9 +944,11 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) /* */ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) { + ActionGroup group(*this); + pkgCache::PkgIterator Pkg = TargetVer.ParentPkg(); StateCache &P = PkgState[Pkg->ID]; - + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -777,6 +961,18 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) Update(Pkg); AddSizes(Pkg); } + +void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto) +{ + StateCache &state = PkgState[Pkg->ID]; + + ActionGroup group(*this); + + if(Auto) + state.Flags |= Flag::Auto; + else + state.Flags &= ~Flag::Auto; +} /*}}}*/ // StateCache::Update - Compute the various static display things /*{{{*/ // --------------------------------------------------------------------- @@ -867,3 +1063,216 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) return Dep.IsCritical(); } /*}}}*/ + +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() + : constructedSuccessfully(false) +{ + Configuration::Item const *Opts; + Opts = _config->Tree("APT::NeverAutoRemove"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + + regex_t *p = new regex_t; + if(regcomp(p,Opts->Value.c_str(), + REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) + { + regfree(p); + delete p; + _error->Error("Regex compilation error for APT::NeverAutoRemove"); + return; + } + + rootSetRegexp.push_back(p); + } + } + + constructedSuccessfully = true; +} + +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() +{ + for(unsigned int i = 0; i < rootSetRegexp.size(); i++) + { + regfree(rootSetRegexp[i]); + delete rootSetRegexp[i]; + } +} + + +bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) +{ + for(unsigned int i = 0; i < rootSetRegexp.size(); i++) + if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0) + return true; + + return false; +} + +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() +{ + DefaultRootSetFunc *f = new DefaultRootSetFunc; + if(f->wasConstructedSuccessfully()) + return f; + else + { + delete f; + return NULL; + } +} + +bool pkgDepCache::MarkFollowsRecommends() +{ + return _config->FindB("APT::AutoRemove::RecommendsImportant", true); +} + +bool pkgDepCache::MarkFollowsSuggests() +{ + return _config->FindB("APT::AutoRemove::SuggestsImportant", false); +} + +// the main mark algorithm +bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) +{ + bool follow_recommends; + bool follow_suggests; + + // init the states + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + PkgState[p->ID].Marked = false; + PkgState[p->ID].Garbage = false; + + // debug output + if(_config->FindB("Debug::pkgAutoRemove",false) + && PkgState[p->ID].Flags & Flag::Auto) + std::clog << "AutoDep: " << p.Name() << std::endl; + } + + // init vars + follow_recommends = MarkFollowsRecommends(); + follow_suggests = MarkFollowsSuggests(); + + + + // do the mark part, this is the core bit of the algorithm + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + if(!(PkgState[p->ID].Flags & Flag::Auto) || + (p->Flags & Flag::Essential) || + userFunc.InRootSet(p)) + + { + // the package is installed (and set to keep) + if(PkgState[p->ID].Keep() && !p.CurrentVer().end()) + MarkPackage(p, p.CurrentVer(), + follow_recommends, follow_suggests); + // the package is to be installed + else if(PkgState[p->ID].Install()) + MarkPackage(p, PkgState[p->ID].InstVerIter(*this), + follow_recommends, follow_suggests); + } + } + + return true; +} + +// mark a single package in Mark-and-Sweep +void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests) +{ + pkgDepCache::StateCache &state = PkgState[pkg->ID]; + VerIterator candver = state.CandidateVerIter(*this); + VerIterator instver = state.InstVerIter(*this); + +#if 0 + // If a package was garbage-collected but is now being marked, we + // should re-select it + // For cases when a pkg is set to upgrade and this trigger the + // removal of a no-longer used dependency. if the pkg is set to + // keep again later it will result in broken deps + if(state.Delete() && state.RemoveReason = Unused) + { + if(ver==candver) + mark_install(pkg, false, false, NULL); + else if(ver==pkg.CurrentVer()) + MarkKeep(pkg, false, false); + + instver=state.InstVerIter(*this); + } +#endif + + // Ignore versions other than the InstVer, and ignore packages + // that are already going to be removed or just left uninstalled. + if(!(ver == instver && !instver.end())) + return; + + // if we are marked already we are done + if(state.Marked) + return; + + //std::cout << "Setting Marked for: " << pkg.Name() << std::endl; + state.Marked=true; + + if(!ver.end()) + { + for(DepIterator d = ver.DependsList(); !d.end(); ++d) + { + if(d->Type == Dep::Depends || + d->Type == Dep::PreDepends || + (follow_recommends && + d->Type == Dep::Recommends) || + (follow_suggests && + d->Type == Dep::Suggests)) + { + // Try all versions of this package. + for(VerIterator V = d.TargetPkg().VersionList(); + !V.end(); ++V) + { + if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer())) + { + MarkPackage(V.ParentPkg(), V, + follow_recommends, follow_suggests); + } + } + // Now try virtual packages + for(PrvIterator prv=d.TargetPkg().ProvidesList(); + !prv.end(); ++prv) + { + if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, + d.TargetVer())) + { + MarkPackage(prv.OwnerPkg(), prv.OwnerVer(), + follow_recommends, follow_suggests); + } + } + } + } + } +} + +bool pkgDepCache::Sweep() +{ + // do the sweep + for(PkgIterator p=PkgBegin(); !p.end(); ++p) + { + StateCache &state=PkgState[p->ID]; + + // if it is not marked and it is installed, it's garbage + if(!state.Marked && (!p.CurrentVer().end() || state.Install()) && + !state.Delete()) + { + state.Garbage=true; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Garbage: " << p.Name() << std::endl; + } + } + + return true; +} diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6d51920e9..fd935c268 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +// -*- mode: c++; mode: fold -*- // Description /*{{{*/ // $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### @@ -45,9 +45,71 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/progress.h> +#include <regex.h> + +#include <vector> + class pkgDepCache : protected pkgCache::Namespace { public: + + /** \brief An arbitrary predicate on packages. */ + class InRootSetFunc + { + public: + virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;}; + virtual ~InRootSetFunc() {}; + }; + + private: + /** \brief Mark a single package and all its unmarked important + * dependencies during mark-and-sweep. + * + * Recursively invokes itself to mark all dependencies of the + * package. + * + * \param pkg The package to mark. + * + * \param ver The version of the package that is to be marked. + * + * \param follow_recommends If \b true, recommendations of the + * package will be recursively marked. + * + * \param follow_suggests If \b true, suggestions of the package + * will be recursively marked. + */ + void MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests); + + /** \brief Update the Marked field of all packages. + * + * Each package's StateCache::Marked field will be set to \b true + * if and only if it can be reached from the root set. By + * default, the root set consists of the set of manually installed + * or essential packages, but it can be extended using the + * parameter #rootFunc. + * + * \param rootFunc A callback that can be used to add extra + * packages to the root set. + * + * \return \b false if an error occured. + */ + bool MarkRequired(InRootSetFunc &rootFunc); + + /** \brief Set the StateCache::Garbage flag on all packages that + * should be removed. + * + * Packages that were not marked by the last call to #MarkRequired + * are tested to see whether they are actually garbage. If so, + * they are marked as such. + * + * \return \b false if an error occured. + */ + bool Sweep(); + + public: // These flags are used in DepState enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2), @@ -63,6 +125,84 @@ class pkgDepCache : protected pkgCache::Namespace enum VersionTypes {NowVersion, InstallVersion, CandidateVersion}; enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2}; + + /** \brief Represents an active action group. + * + * An action group is a group of actions that are currently being + * performed. While an active group is active, certain routine + * clean-up actions that would normally be performed after every + * cache operation are delayed until the action group is + * completed. This is necessary primarily to avoid inefficiencies + * when modifying a large number of packages at once. + * + * This class represents an active action group. Creating an + * instance will create an action group; destroying one will + * destroy the corresponding action group. + * + * The following operations are suppressed by this class: + * + * - Keeping the Marked and Garbage flags up to date. + * + * \note This can be used in the future to easily accumulate + * atomic actions for undo or to display "what apt did anyway"; + * e.g., change the counter of how many action groups are active + * to a std::set of pointers to them and use those to store + * information about what happened in a group in the group. + */ + class ActionGroup + { + pkgDepCache &cache; + + bool released; + + /** Action groups are noncopyable. */ + ActionGroup(const ActionGroup &other); + public: + /** \brief Create a new ActionGroup. + * + * \param cache The cache that this ActionGroup should + * manipulate. + * + * As long as this object exists, no automatic cleanup + * operations will be undertaken. + */ + ActionGroup(pkgDepCache &cache); + + /** \brief Clean up the action group before it is destroyed. + * + * If it is destroyed later, no second cleanup wil be run. + */ + void release(); + + /** \brief Destroy the action group. + * + * If this is the last action group, the automatic cache + * cleanup operations will be undertaken. + */ + ~ActionGroup(); + }; + + /** \brief Returns \b true for packages matching a regular + * expression in APT::NeverAutoRemove. + */ + class DefaultRootSetFunc : public InRootSetFunc + { + std::vector<regex_t *> rootSetRegexp; + bool constructedSuccessfully; + + public: + DefaultRootSetFunc(); + ~DefaultRootSetFunc(); + + /** \return \b true if the class initialized successfully, \b + * false otherwise. Used to avoid throwing an exception, since + * APT classes generally don't. + */ + bool wasConstructedSuccessfully() const { return constructedSuccessfully; } + + bool InRootSet(const pkgCache::PkgIterator &pkg); + }; + struct StateCache { // Epoch stripped text versions of the two version fields @@ -79,6 +219,17 @@ class pkgDepCache : protected pkgCache::Namespace unsigned short Flags; unsigned short iFlags; // Internal flags + /** \brief \b true if this package can be reached from the root set. */ + bool Marked; + + /** \brief \b true if this package is unused and should be removed. + * + * This differs from !#Marked, because it is possible that some + * unreachable packages will be protected from becoming + * garbage. + */ + bool Garbage; + // Various tree indicators signed char Status; // -1,0,1,2 unsigned char Mode; // ModeList @@ -119,6 +270,14 @@ class pkgDepCache : protected pkgCache::Namespace virtual ~Policy() {}; }; + + private: + /** The number of open "action groups"; certain post-action + * operations are suppressed if this number is > 0. + */ + int group_level; + + friend class ActionGroup; protected: @@ -182,16 +341,68 @@ class pkgDepCache : protected pkgCache::Namespace inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];}; inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];}; - // Manipulators - void MarkKeep(PkgIterator const &Pkg,bool Soft = false); + /** \return A function identifying packages in the root set other + * than manually installed packages and essential packages, or \b + * NULL if an error occurs. + * + * \todo Is this the best place for this function? Perhaps the + * settings for mark-and-sweep should be stored in a single + * external class? + */ + virtual InRootSetFunc *GetRootSetFunc(); + + /** \return \b true if the garbage collector should follow recommendations. + */ + virtual bool MarkFollowsRecommends(); + + /** \return \b true if the garbage collector should follow suggestions. + */ + virtual bool MarkFollowsSuggests(); + + /** \brief Update the Marked and Garbage fields of all packages. + * + * This routine is implicitly invoked after all state manipulators + * and when an ActionGroup is destroyed. It invokes #MarkRequired + * and #Sweep to do its dirty work. + * + * \param rootFunc A predicate that returns \b true for packages + * that should be added to the root set. + */ + bool MarkAndSweep(InRootSetFunc &rootFunc) + { + return MarkRequired(rootFunc) && Sweep(); + } + + bool MarkAndSweep() + { + std::auto_ptr<InRootSetFunc> f(GetRootSetFunc()); + if(f.get() != NULL) + return MarkAndSweep(*f.get()); + else + return false; + } + + /** \name State Manipulators + */ + // @{ + void MarkKeep(PkgIterator const &Pkg, bool Soft = false, + bool FromUser = true); void MarkDelete(PkgIterator const &Pkg,bool Purge = false); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, - unsigned long Depth = 0); + unsigned long Depth = 0, bool FromUser = true); void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); + + /** Set the "is automatically installed" flag of Pkg. */ + void MarkAuto(const PkgIterator &Pkg, bool Auto); + // @} // This is for debuging void Update(OpProgress *Prog = 0); + + // read persistent states + bool readStateFile(OpProgress *prog); + bool writeStateFile(OpProgress *prog); // Size queries inline double UsrSize() {return iUsrSize;}; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 6118845e8..6aa486a7f 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.cc,v 1.21 2004/02/27 00:46:44 mdz Exp $ +// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $ /* ###################################################################### Init - Initialize the package library @@ -64,13 +64,14 @@ bool pkgInitConfig(Configuration &Cnf) // Configuration Cnf.Set("Dir::Etc","etc/apt/"); Cnf.Set("Dir::Etc::sourcelist","sources.list"); + Cnf.Set("Dir::Etc::sourceparts","sources.list.d"); Cnf.Set("Dir::Etc::vendorlist","vendors.list"); Cnf.Set("Dir::Etc::vendorparts","vendors.list.d"); Cnf.Set("Dir::Etc::main","apt.conf"); Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); - + bool Res = true; // Read an alternate config file diff --git a/apt-pkg/init.h b/apt-pkg/init.h index e21351797..51a7ba2eb 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -17,8 +17,8 @@ #include <apt-pkg/pkgsystem.h> // See the makefile -#define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 10 +#define APT_PKG_MAJOR 4 +#define APT_PKG_MINOR 1 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 0e6aecc65..29c8ee135 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.11 +MAJOR=4.1 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) @@ -21,11 +21,11 @@ APT_DOMAIN:=libapt-pkg$(MAJOR) # Source code for the contributed non-core things SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \ - contrib/md5.cc contrib/sha1.cc contrib/hashes.cc \ + contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \ contrib/cdromutl.cc contrib/crc-16.cc \ contrib/fileutl.cc HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \ - md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h # Source code for the core main library SOURCE+= pkgcache.cc version.cc depcache.cc \ diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 155408bb4..b0dd43629 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -106,7 +106,7 @@ bool pkgPackageManager::FixMissing() // Okay, this file is missing and we need it. Mark it for keep Bad = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } // We have to empty the list otherwise it will not have the new changes @@ -593,7 +593,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() Pkg.State() == pkgCache::PkgIterator::NeedsNothing && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall) { - _error->Error("Internal Error, trying to manipulate a kept package"); + _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name()); return Failed; } @@ -631,12 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { - OrderResult Res = OrderInstall(); - if (Res != Failed) - if (Go(status_fd) == false) - return Failed; - return Res; + if(DoInstallPreFork() == Failed) + return Failed; + + return DoInstallPostFork(statusFd); } /*}}}*/ diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index f64637d03..48f53576c 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -28,7 +28,9 @@ #endif #include <string> +#include <iostream> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/depcache.h> using std::string; @@ -70,13 +72,39 @@ class pkgPackageManager : protected pkgCache::Namespace virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;}; virtual bool Go(int statusFd=-1) {return true;}; virtual void Reset() {}; - + + // the result of the operation + OrderResult Res; + public: // Main action members bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs); - OrderResult DoInstall(int statusFd=-1); + + // Do the installation + OrderResult DoInstall(int statusFd=-1); + + // stuff that needs to be done before the fork() of a library that + // uses apt + OrderResult DoInstallPreFork() { + Res = OrderInstall(); + return Res; + }; + + // stuff that needs to be done after the fork + OrderResult DoInstallPostFork(int statusFd=-1) { + bool goResult = Go(statusFd); + if(goResult == false) + return Failed; + + // if all was fine update the state file + if(Res == Completed) { + Cache.writeStateFile(NULL); + } + return Res; + }; + bool FixMissing(); pkgPackageManager(pkgDepCache *Cache); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 4452079a2..162ab4f27 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -164,7 +164,7 @@ bool pkgCache::ReMap() /* This is used to generate the hash entries for the HashTable. With my package list from bo this function gets 94% table usage on a 512 item table (480 used items) */ -unsigned long pkgCache::sHash(string Str) const +unsigned long pkgCache::sHash(const string &Str) const { unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) @@ -184,7 +184,7 @@ unsigned long pkgCache::sHash(const char *Str) const // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::FindPkg(string Name) +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { // Look at the hash bucket Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)]; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 6a54ad5ba..c7a3172cc 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -95,7 +95,7 @@ class pkgCache string CacheFile; MMap ⤅ - unsigned long sHash(string S) const; + unsigned long sHash(const string &S) const; unsigned long sHash(const char *S) const; public: @@ -119,14 +119,14 @@ class pkgCache inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; // String hashing function (512 range) - inline unsigned long Hash(string S) const {return sHash(S);}; + inline unsigned long Hash(const string &S) const {return sHash(S);}; inline unsigned long Hash(const char *S) const {return sHash(S);}; // Usefull transformation things const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(string Name); + PkgIterator FindPkg(const string &Name); Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1ba791b45..3f02725c1 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -26,6 +26,8 @@ #include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> +#include <apt-pkg/tagfile.h> + #include <apti18n.h> #include <vector> @@ -315,7 +317,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ -bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name) +bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name) { Pkg = Cache.FindPkg(Name); if (Pkg.end() == false) @@ -379,7 +381,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, // --------------------------------------------------------------------- /* This puts a version structure in the linked list */ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, - string VerStr, + const string &VerStr, unsigned long Next) { // Get a structure @@ -459,8 +461,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, /* This creates a dependency element in the tree. It is linked to the version and to the package that it is pointing to. */ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, - string PackageName, - string Version, + const string &PackageName, + const string &Version, unsigned int Op, unsigned int Type) { @@ -524,8 +526,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* */ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, - string PackageName, - string Version) + const string &PackageName, + const string &Version) { pkgCache &Cache = Owner->Cache; @@ -564,7 +566,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* This is used to select which file is to be associated with all newly added versions. The caller is responsible for setting the IMS fields. */ -bool pkgCacheGenerator::SelectFile(string File,string Site, +bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, const pkgIndexFile &Index, unsigned long Flags) { @@ -648,7 +650,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, /* This just verifies that each file in the list of index files exists, has matching attributes with the cache and the cache does not have any extra files. */ -static bool CheckValidity(string CacheFile, FileIterator Start, +static bool CheckValidity(const string &CacheFile, FileIterator Start, FileIterator End,MMap **OutMap = 0) { // No file, certainly invalid diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 6ab8594d9..fae1a60a6 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -54,19 +54,19 @@ class pkgCacheGenerator // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); - unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next); + unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); public: unsigned long WriteUniqString(const char *S,unsigned int Size); - inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());}; + inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());}; void DropProgress() {Progress = 0;}; - bool SelectFile(string File,string Site,pkgIndexFile const &Index, + bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index, unsigned long Flags = 0); bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0); inline pkgCache &GetCache() {return Cache;}; @@ -97,12 +97,13 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);}; inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; - inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);}; + inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,string Package, - string Version,unsigned int Op, + bool NewDepends(pkgCache::VerIterator Ver,const string &Package, + const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version); + bool NewProvides(pkgCache::VerIterator Ver,const string &Package, + const string &Version); public: diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index f62f945b5..b22f3e73f 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) if (Files[I->ID] == 0) return; } - // We store that to make sure that the destructor won't segfault, - // even if the Cache object was destructed before this instance. - PackageFileCount = Cache.HeaderP->PackageFileCount; } /*}}}*/ // Records::~pkgRecords - Destructor /*{{{*/ @@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) /* */ pkgRecords::~pkgRecords() { - for (unsigned I = 0; I != PackageFileCount; I++) + for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++) delete Files[I]; delete [] Files; } diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index ece91680e..31c444dbf 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -33,7 +33,6 @@ class pkgRecords pkgCache &Cache; Parser **Files; - int PackageFileCount; public: diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 95aba0cb5..e3b4d94f8 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.25 2004/06/07 23:08:00 mdz Exp $ +// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $ /* ###################################################################### List of Sources @@ -21,6 +21,13 @@ #include <apti18n.h> #include <fstream> + +// CNC:2003-03-03 - This is needed for ReadDir stuff. +#include <algorithm> +#include <stdio.h> +#include <dirent.h> +#include <sys/stat.h> +#include <unistd.h> /*}}}*/ using namespace std; @@ -142,23 +149,66 @@ pkgSourceList::~pkgSourceList() /* */ bool pkgSourceList::ReadMainList() { - return Read(_config->FindFile("Dir::Etc::sourcelist")); + // CNC:2003-03-03 - Multiple sources list support. + bool Res = true; +#if 0 + Res = ReadVendors(); + if (Res == false) + return false; +#endif + + Reset(); + // CNC:2003-11-28 - Entries in sources.list have priority over + // entries in sources.list.d. + string Main = _config->FindFile("Dir::Etc::sourcelist"); + if (FileExists(Main) == true) + Res &= ReadAppend(Main); + + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Parts) == true) + Res &= ReadSourceDir(Parts); + + return Res; } /*}}}*/ +// CNC:2003-03-03 - Needed to preserve backwards compatibility. +// SourceList::Reset - Clear the sourcelist contents /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgSourceList::Reset() +{ + for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) + delete *I; + SrcList.erase(SrcList.begin(),SrcList.end()); +} + /*}}}*/ +// CNC:2003-03-03 - Function moved to ReadAppend() and Reset(). // SourceList::Read - Parse the sourcelist file /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgSourceList::Read(string File) { + Reset(); + return ReadAppend(File); +} + /*}}}*/ +// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadAppend(string File) +{ // Open the stream for reading ifstream F(File.c_str(),ios::in /*| ios::nocreate*/); if (!F != 0) return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str()); +#if 0 // Now Reset() does this. for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) delete *I; SrcList.erase(SrcList.begin(),SrcList.end()); - char Buffer[300]; +#endif + // CNC:2003-12-10 - 300 is too short. + char Buffer[1024]; int CurLine = 0; while (F.eof() == false) @@ -172,7 +222,10 @@ bool pkgSourceList::Read(string File) char *I; - for (I = Buffer; *I != 0 && *I != '#'; I++); + // CNC:2003-02-20 - Do not break if '#' is inside []. + for (I = Buffer; *I != 0 && *I != '#'; I++) + if (*I == '[') + for (I++; *I != 0 && *I != ']'; I++); *I = 0; const char *C = _strstrip(Buffer); @@ -259,3 +312,55 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const return true; } /*}}}*/ +// CNC:2003-03-03 - By Anton V. Denisov <avd@altlinux.org>. +// SourceList::ReadSourceDir - Read a directory with sources files +// Based on ReadConfigDir() /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadSourceDir(string Dir) +{ + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + vector<string> List; + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) + { + if (Ent->d_name[0] == '.') + continue; + + // CNC:2003-12-02 Only accept .list files as valid sourceparts + if (flExtension(Ent->d_name) != "list") + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; C++) + if (isalpha(*C) == 0 && isdigit(*C) == 0 + && *C != '_' && *C != '-' && *C != '.') + break; + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + sort(List.begin(),List.end()); + + // Read the files + for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadAppend(*I) == false) + return false; + return true; + +} + /*}}}*/ + diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 5d8427017..123ae6984 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -77,6 +77,11 @@ class pkgSourceList bool ReadMainList(); bool Read(string File); + + // CNC:2003-03-03 + void Reset(); + bool ReadAppend(string File); + bool ReadSourceDir(string Dir); // List accessors inline const_iterator begin() const {return SrcList.begin();}; diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index cae0fa819..25e2930fa 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -35,20 +35,20 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size) { - if (Fd.IsOpen() == false) + if (Fd.IsOpen() == false || Fd.Size() == 0) { Buffer = 0; Start = End = Buffer = 0; - Done = true; iOffset = 0; + Map = NULL; return; } - Buffer = new char[Size]; - Start = End = Buffer; - Done = false; + Map = new MMap (Fd, MMap::Public | MMap::ReadOnly); + Buffer = (char *) Map->Data (); + Start = Buffer; + End = Buffer + Map->Size (); iOffset = 0; - Fill(); } /*}}}*/ // TagFile::~pkgTagFile - Destructor /*{{{*/ @@ -56,7 +56,7 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : /* */ pkgTagFile::~pkgTagFile() { - delete [] Buffer; + delete Map; } /*}}}*/ // TagFile::Step - Advance to the next section /*{{{*/ @@ -64,14 +64,13 @@ pkgTagFile::~pkgTagFile() /* If the Section Scanner fails we refill the buffer and try again. */ bool pkgTagFile::Step(pkgTagSection &Tag) { + if (Start == End) + return false; + if (Tag.Scan(Start,End - Start) == false) { - if (Fill() == false) - return false; - - if (Tag.Scan(Start,End - Start) == false) - return _error->Error(_("Unable to parse package file %s (1)"), - Fd.Name().c_str()); + return _error->Error(_("Unable to parse package file %s (1)"), + Fd.Name().c_str()); } Start += Tag.size(); iOffset += Tag.size(); @@ -80,50 +79,6 @@ bool pkgTagFile::Step(pkgTagSection &Tag) return true; } /*}}}*/ -// TagFile::Fill - Top up the buffer /*{{{*/ -// --------------------------------------------------------------------- -/* This takes the bit at the end of the buffer and puts it at the start - then fills the rest from the file */ -bool pkgTagFile::Fill() -{ - unsigned long EndSize = End - Start; - unsigned long Actual = 0; - - memmove(Buffer,Start,EndSize); - Start = Buffer; - End = Buffer + EndSize; - - if (Done == false) - { - // See if only a bit of the file is left - if (Fd.Read(End,Size - (End - Buffer),&Actual) == false) - return false; - if (Actual != Size - (End - Buffer)) - Done = true; - End += Actual; - } - - if (Done == true) - { - if (EndSize <= 3 && Actual == 0) - return false; - if (Size - (End - Buffer) < 4) - return true; - - // Append a double new line if one does not exist - unsigned int LineCount = 0; - for (const char *E = End - 1; E - End < 6 && (*E == '\n' || *E == '\r'); E--) - if (*E == '\n') - LineCount++; - for (; LineCount < 2; LineCount++) - *End++ = '\n'; - - return true; - } - - return true; -} - /*}}}*/ // TagFile::Jump - Jump to a pre-recorded location in the file /*{{{*/ // --------------------------------------------------------------------- /* This jumps to a pre-recorded file location and reads the record @@ -141,22 +96,10 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) // Reposition and reload.. iOffset = Offset; - Done = false; - if (Fd.Seek(Offset) == false) - return false; - End = Start = Buffer; - - if (Fill() == false) - return false; - - if (Tag.Scan(Start,End - Start) == true) - return true; - - // This appends a double new line (for the real eof handling) - if (Fill() == false) - return false; + Start = Buffer + iOffset; - if (Tag.Scan(Start,End - Start) == false) + // Start != End is a special case to not fail on empty TagFiles + if (Start != End && Tag.Scan(Start,End - Start) == false) return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str()); return true; @@ -181,7 +124,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) Stop = Section = Start; memset(AlphaIndexes,0,sizeof(AlphaIndexes)); - if (Stop == 0) + if (Stop == 0 || MaxLength == 0) return false; TagCount = 0; @@ -212,6 +155,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) Stop++; } + if ((Stop+1 >= End) && (End[-1] == '\n' || End[-1] == '\r')) + { + Indexes[TagCount] = (End - 1) - Section; + return true; + } + return false; } /*}}}*/ @@ -394,7 +343,8 @@ static const char *iTFRewritePackageOrder[] = { "Filename", "Size", "MD5Sum", - "SHA1Sum", + "SHA1", + "SHA256", "MSDOS-Filename", // Obsolete "Description", 0}; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 8c948754d..5cff2681c 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -25,6 +25,7 @@ #endif #include <apt-pkg/fileutl.h> +#include <apt-pkg/mmap.h> #include <stdio.h> class pkgTagSection @@ -69,15 +70,13 @@ class pkgTagSection class pkgTagFile { FileFd &Fd; + MMap *Map; char *Buffer; char *Start; char *End; - bool Done; unsigned long iOffset; unsigned long Size; - bool Fill(); - public: bool Step(pkgTagSection &Section); diff --git a/buildlib/archtable b/buildlib/archtable index b01743c02..197529202 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,6 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k +arm.*b armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c3d08d9d4..a171522d5 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1) PARALLEL_RUN=no endif -ifndef PARALLEL_RUN - PARALLEL_RUN=yes - .EXPORT: PARALLEL_RUN - # handle recursion - ifneq ($(NUM_PROCS),) - MAKEFLAGS += -j $(NUM_PROCS) - endif -endif +# mvo: commented out, lead to build failures in the arch-build target +#ifndef PARALLEL_RUN +# PARALLEL_RUN=yes +# .EXPORT: PARALLEL_RUN +# # handle recursion +# ifneq ($(NUM_PROCS),) +# MAKEFLAGS += -j $(NUM_PROCS) +# endif +#endif diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index f5ee539ac..2d28e1c67 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -28,6 +28,8 @@ INLINEDEPFLAG = -MD DEBIANDOC_HTML = @DEBIANDOC_HTML@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ +DOXYGEN = @DOXYGEN@ + # SGML for the man pages DOCBOOK2MAN := @DOCBOOK2MAN@ diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index e1ae0c805..511a5cae2 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile (echo $(SRC) | xargs -n1 echo) > $@ -binary program: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list +binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list diff --git a/buildlib/sizetable b/buildlib/sizetable index 911180145..8b18528cf 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +armeb big 1 4 2 4 arm little 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index cb1aeb514..74fa71cba 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1630,10 +1630,11 @@ bool Madison(CommandLine &CmdL) pkgCache &Cache = *GCache; - // Create the text record parsers + // Create the src text record parsers and ignore errors about missing + // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords pkgSrcRecords SrcRecs(*SrcList); if (_error->PendingError() == true) - return false; + _error->Discard(); for (const char **I = CmdL.FileList + 1; *I != 0; I++) { diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3475d79ae..8b3c68573 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -38,6 +38,7 @@ #include <apt-pkg/version.h> #include <apt-pkg/cachefile.h> #include <apt-pkg/sptr.h> +#include <apt-pkg/md5.h> #include <apt-pkg/versionmatch.h> #include <config.h> @@ -45,6 +46,7 @@ #include "acqprogress.h" +#include <set> #include <locale.h> #include <langinfo.h> #include <fstream> @@ -58,6 +60,7 @@ #include <errno.h> #include <regex.h> #include <sys/wait.h> +#include <sstream> /*}}}*/ using namespace std; @@ -993,7 +996,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, cerr << _("Unable to correct missing packages.") << endl; return _error->Error(_("Aborting install.")); } - + _system->UnLock(); int status_fd = _config->FindI("APT::Status-Fd",-1); pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); @@ -1200,7 +1203,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); } - else if(DefRel.empty() == false) + else if(!Pkg.end() && DefRel.empty() == false) { // we have a default release, try to locate the pkg. we do it like // this because GetCandidateVer() will not "downgrade", that means @@ -1366,7 +1369,7 @@ bool DoUpdate(CommandLine &CmdL) } // Clean out any old list files - if (_config->FindB("APT::Get::List-Cleanup",true) == true) + if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true) { if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) @@ -1384,6 +1387,52 @@ bool DoUpdate(CommandLine &CmdL) return true; } /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + if(_config->FindI("Debug::pkgAutoRemove",false)) + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false) + return _error->Error(_("We are not supposed to delete stuff, can't " + "start AutoRemover")); + + { + pkgDepCache::ActionGroup group(*Cache); + + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + fprintf(stdout,"We could delete %s\n", Pkg.Name()); + + if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } + } + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) + { + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); + } + return true; +} + // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@ -1409,15 +1458,6 @@ bool DoUpgrade(CommandLine &CmdL) /* Install named packages */ bool DoInstall(CommandLine &CmdL) { - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) @@ -1435,6 +1475,11 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } for (const char **I = CmdL.FileList + 1; *I != 0; I++) { @@ -1584,6 +1629,11 @@ bool DoInstall(CommandLine &CmdL) return _error->Error(_("Broken packages")); } + if (_config->FindB("APT::Get::AutomaticRemove")) { + if (!DoAutomaticRemove(Cache)) + return false; + } + /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@ -1603,8 +1653,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); @@ -1721,6 +1771,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) return false; + pkgDepCache::ActionGroup group(Cache); + // Install everything with the install flag set pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) @@ -1899,6 +1951,9 @@ bool DoSource(CommandLine &CmdL) DscFile *Dsc = new DscFile[CmdL.FileSize()]; + // insert all downloaded uris into this set to avoid downloading them + // twice + set<string> queued; // Load the requestd sources into the fetcher unsigned J = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) @@ -1935,7 +1990,28 @@ bool DoSource(CommandLine &CmdL) if (_config->FindB("APT::Get::Tar-Only",false) == true && I->Type != "tar") continue; - + + // don't download the same uri twice (should this be moved to + // the fetcher interface itself?) + if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) + continue; + 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) + { + ioprintf(c1out,_("Skipping already downloaded file '%s'\n"), + flNotDir(I->Path).c_str()); + continue; + } + } + new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path), I->MD5Hash,I->Size, Last->Index().SourceInfo(*Last,*I),Src); @@ -2449,6 +2525,7 @@ void GetInitialize() _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@ -2504,6 +2581,7 @@ int main(int argc,const char *argv[]) {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, + {0,"auto-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, @@ -2512,6 +2590,7 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"autoremove",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --git a/cmdline/apt-key b/cmdline/apt-key index 0685e36f7..7460a24be 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -16,7 +16,7 @@ REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-keyring package installed?" + echo >&2 "Is the debian-archive-keyring package installed?" exit 1 fi diff --git a/cmdline/apt-mark b/cmdline/apt-mark new file mode 100755 index 000000000..533ed8715 --- /dev/null +++ b/cmdline/apt-mark @@ -0,0 +1,63 @@ +#!/usr/bin/python + +from optparse import OptionParser + +try: + import apt_pkg +except ImportError: + print "Error importing apt_pkg, is python-apt installed?" + +import sys +import os.path + +actions = { "markauto" : 1, + "unmarkauto": 0 + } + +if __name__ == "__main__": + apt_pkg.init() + + # option parsing + parser = OptionParser() + parser.usage = "%prog [options] {markauto|unmarkauto} packages..." + parser.add_option("-f", "--file", action="store", type="string", + dest="filename", + help="read/write a different file") + parser.add_option("-v", "--verbose", + action="store_true", dest="verbose", default=False, + help="print verbose status messages to stdout") + (options, args) = parser.parse_args() + if len(args) < 2: + parser.error("not enough argument") + + # get pkgs to change + if args[0] not in actions.keys(): + parser.error("first argument must be 'markauto' or 'unmarkauto'") + pkgs = args[1:] + action = actions[args[0]] + + # get the state-file + if not options.filename: + STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + else: + STATE_FILE=options.state_file + + # open the statefile + if os.path.exists(STATE_FILE): + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + while tagfile.Step(): + pkgname = tagfile.Section.get("Package") + autoInst = tagfile.Section.get("Auto-Installed") + if pkgname in pkgs: + if options.verbose: + print "changing %s to %s" % (pkgname,action) + newsec = apt_pkg.RewriteSection(tagfile.Section, + [], + [ ("Auto-Installed",str(action)) ] + ) + outfile.write(newsec+"\n") + else: + outfile.write(str(tagfile.Section)+"\n") + # all done, rename the tmpfile + os.rename(outfile.name, STATE_FILE) diff --git a/configure.in b/configure.in index 87dac8e47..5b60e3070 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -175,12 +175,21 @@ dnl Check for debiandoc AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + dnl Check for the SGML tools needed to build man pages AC_PATH_PROG(DOCBOOK2MAN,docbook2man) dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) +dnl Check for graphviz +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) +AC_PATH_PROG([DOT], [dot], []) +DOTDIR=$(dirname $DOT) +AC_SUBST(DOTDIR) + dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") @@ -192,7 +201,7 @@ ah_GCC3DEP dnl It used to be that the user could select translations and that could get dnl passed to the makefiles, but now that can only work if you use special dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) @@ -200,4 +209,4 @@ fi AC_SUBST(USE_NLS) AC_PATH_PROG(BASH, bash) -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index db04b1e91..f44d1966b 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt <mvo@debian.org> Wed, 26 Apr 2006 12:57:53 +0200 + apt (0.5.25) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a diff --git a/debian/apt.dirs b/debian/apt.dirs index d39bfd1f7..e1cb738fa 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic diff --git a/debian/changelog b/debian/changelog index 0e85b5117..b78cd9641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,238 @@ +apt (0.6.44.2exp2) experimental; urgency=low + + * fix apt-get dist-upgrade + * fix warning if no /var/lib/apt/extended_states is present + * don't download Translations for deb-src sources.list lines + + -- Michael Vogt <mvo@debian.org> Tue, 25 Jul 2006 15:12:05 +0200 + +apt (0.6.44.2exp1) experimental; urgency=low + + * added support for i18n of the package descriptions + * added support for aptitude like auto-install tracking (a HUGE + HUGE thanks to Daniel Burrows who made this possible) + * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch + * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental + + -- Michael Vogt <mvo@debian.org> Mon, 3 Jul 2006 21:50:31 +0200 + +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + + -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200 + +apt (0.6.44.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't give an error when parsing empty Packages/Sources files. + (Closes: #366931, #367086, #370160) + + -- Steinar H. Gunderson <sesse@debian.org> Fri, 9 Jun 2006 00:52:21 +0200 + +apt (0.6.44.1) unstable; urgency=low + + * apt-pkg/acquire-item.cc: + - fix reversed logic of the "Acquire::PDiffs" option + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + - po/LINGUAS: added "bg" Closes: #360262 + - po/gl.po: Galician translation update. Closes: #366849 + - po/hu.po: Hungarian translation update. Closes: #365448 + - po/cs.po: Czech translation updated. Closes: #367244 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) + + -- Michael Vogt <mvo@debian.org> Tue, 16 May 2006 21:51:16 +0200 + +apt (0.6.44) unstable; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 + (thanks to Anthony Towns) + * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations + (thanks to Anthony Towns) + * apt pdiff support from experimental merged + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + * apt-pkg/deb/dpkgpm.cc: + - wording fixes (thanks to Matt Zimmerman) + - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp) + * apt-pkg/tagfile.{cc,h}: + - use MMap to read the entries (thanks to Zephaniah E. Hull for the + patch) Closes: #350025 + * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * bg.po: Added, complete to 512t. Closes: #360262 + * doc/apt-ftparchive.1.xml: + - fix documentation for "SrcPackages" -> "Sources" + (thanks to Bart Martens for the patch, closes: #307756) + * debian/libapt-pkg-doc.doc-base.cache: + - remove broken charackter from description (closes: #361129) + * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: + - i18n fixes (closes: #349298) + * debian/postinst: dont fail on not available + /usr/share/doc/apt/examples/sources.list (closes: #361130) + * methods/ftp.cc: + - unlink empty file in partial if the download failed because + the file is missing on the server (closes: #316337) + * apt-pkg/deb/debversion.cc: + - treats a version string with explicit zero epoch equal + than the same without epoch (Policy 5.6.12, closes: #363358) + Thanks to Lionel Elie Mamane for the patch + + -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 + +apt (0.6.43.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings + * vi.po: Completed to 511 strings Closes: #348968 + * zh_CN.po: Completed to 512t. Closes: #353936 + * it.po: Completed to 512t. Closes: #352803 + * pt_BR.po: Completed to 512t. Closes: #352419 + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + + -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 + +apt (0.6.43.2) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: + - en_GB.po, de.po: fix spaces errors in "Ign " translations Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + - el.po: Completed to 511 strings Closes: #344642 + - da.po: Completed to 511 strings Closes: #348574 + - es.po: Updated to 510t1f Closes: #348158 + - gl.po: Completed to 511 strings Closes: #347729 + - it.po: Yet another update Closes: #347435 + * added debian-archive-keyring to the Recommends (closes: #347970) + * fixed message in apt-key to install debian-archive-keyring + * typos fixed in apt-cache.8 (closes: #348348, #347349) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + + -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100 + +apt (0.6.43.1) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: + * fr.po: Completed to 510 strings + * it.po: Completed to 510t + * en_GB.po: Completed to 510t + * cs.po: Completed to 510t + * zh_CN.po: Completed to 510t + * el.po: Updated to 510t + * vi.po: Updated to 383t93f34u + * tl.po: Completed to 510 strings (Closes: #344306) + * sv.po: Completed to 510 strings (Closes: #344056) + * LINGUAS: disabled Hebrew translation. (Closes: #313283) + * eu.po: Completed to 510 strings (Closes: #342091) + * apt-get source won't download already downloaded files again + (closes: #79277) + * share/debian-archive.gpg: new 2006 ftp-archive signing key added + (#345891) + * redownload the Release file if IMS-Hit and gpg failure + * deal with multiple signatures on a Release file + + -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 + +apt (0.6.43) unstable; urgency=medium + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: + * zh_CN.po: Completed to 510 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + * make pkgDirStream (a bit) more complete + * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) + (closes: #339533) + * pkgAcqFile is more flexible now (closes: #57091) + * support a download rate limit for http (closes: #146877) + * included lots of the speedup changes from #319377 + * add stdint.h to contrib/md5.h (closes: #340448) + * ABI change, library name changed (closes: #339147) + * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) + * switch to libdb4.3 in build-depends + + -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 + +apt (0.6.42.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: + - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + - patch-119: add update-po as a pre-req for binary (closes: #329910) + - patch-121: Complete French translation + - patch-125: Fixed localization of y/n questions in German translation + (closes: #337078) + - patch-126: Swedish translation update (closes: #337163) + - patch-127: Complete Tagalog translation (closes: #337306) + - patch-128: Danish translation update (closes: #337949) + - patch-129: Basque translation update (closes: #338101) + * cmdline/apt-get.cc: + - bufix in FindSrc (closes: #335213, #337910) + * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) + + -- Michael Vogt <mvo@debian.org> Wed, 9 Nov 2005 07:22:31 +0100 + +apt (0.6.42.2) unstable; urgency=high + + * NMU (approved by maintainer) + * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500). + * Add big-endian arm (armeb) support (closes: #333599). + * Priority high to get the AMD key into testing ASAP. + + -- Frans Pop <fjp@debian.org> Sun, 30 Oct 2005 21:29:11 +0100 + +apt (0.6.42.1) unstable; urgency=low + + * fix a incorrect example in the apt_prefrences man page + (thanks to Filipus Klutiero, closes: #282918) + * apt-pkg/pkgrecords.cc: + - revert patch from last version, it causes trouble on alpha + and ia64 (closes: #335102, #335103) + * cmdline/apt-get.cc: + - be extra carefull in FindSrc (closes: #335213) + + -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200 + apt (0.6.42) unstable; urgency=low * apt-pkg/cdrom.cc: @@ -17,7 +252,7 @@ apt (0.6.42) unstable; urgency=low * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) * support for apt-get [build-dep|source] -t (closes: #152129) - * added "APT::Authentication::Trust-CDROM" option to make the life + * added "APT::Authentication::TrustCDROM" option to make the life for the installer people easier (closes: #334656) * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) (closes: #334671) @@ -29,7 +264,7 @@ apt (0.6.42) unstable; urgency=low * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) - + -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200 apt (0.6.41) unstable; urgency=low @@ -114,7 +349,6 @@ apt (0.6.38) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700 ->>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 @@ -130,6 +364,7 @@ apt (0.6.37) breezy; urgency=low * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) * Change debian/bugscript to use #!/bin/bash (Closes: #313402) + * Fix a incorrect example in the man-page (closes: #282918) -- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700 diff --git a/debian/compat b/debian/compat index 00750edc0..7ed6ff82d 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -3 +5 diff --git a/debian/control b/debian/control index 4aa7b5aa2..53ce851f6 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: admin Priority: important Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org> -Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) +Standards-Version: 3.6.2.2 +Build-Depends: debhelper (>= 5.0), libdb4.3-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt @@ -13,6 +13,7 @@ Depends: ${shlibs:Depends} Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} +Recommends: debian-archive-keyring Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index b58b79bd1..59558dee8 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Cache Specification describes the complete implementation and format of the APT Cache file. The APT Cache file is a way for APT to parse and store a large number of package files for display in the UI. - It's primarydesign goal is to make display of a single package in the + It's primary design goal is to make display of a single package in the tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. diff --git a/debian/postinst b/debian/postinst index 891792111..1588f5241 100755 --- a/debian/postinst +++ b/debian/postinst @@ -12,7 +12,10 @@ set -e create_apt_conf () { - cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list + EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list + if [ -f $EXAMPLE_SOURCE ]; then + cp $EXAMPLE_SOURCE /etc/apt/sources.list + fi } check_apt_conf () diff --git a/debian/rules b/debian/rules index cd026b4a4..044f742d0 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,7 @@ endif # Default rule build: +PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) @@ -335,6 +336,6 @@ cvs-mkul: arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) - baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER) + tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in new file mode 100644 index 000000000..f19ff93f6 --- /dev/null +++ b/doc/Doxyfile.in @@ -0,0 +1,1238 @@ +# Doxyfile 1.4.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a 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 (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the 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. + +PROJECT_NUMBER = @VERSION@ + +# 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. + +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. + +CREATE_SUBDIRS = 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: +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, +# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, +# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, +# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). + +USE_WINDOWS_ENCODING = NO + +# 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. + +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 +# brief descriptions will be completely suppressed. + +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" + +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 +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# 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. + +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. + +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. + +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. + +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 is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +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 the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_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. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = 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. + +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. + +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. + +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. + +ALIASES = + +# 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. + +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. + +OPTIMIZE_OUTPUT_JAVA = NO + +# 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 make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# 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. + +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. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# 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 and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +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. + +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. + +EXTRACT_LOCAL_METHODS = 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. + +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. + +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. + +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. + +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. + +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 +# 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. + +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. + +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. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +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. + +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. + +SORT_BRIEF_DOCS = 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. +# 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. + +SORT_BY_SCOPE_NAME = 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. + +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. + +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. + +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. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define 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 defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +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. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is YES. + +SHOW_DIRECTORIES = 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. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# 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. + +QUIET = NO + +# 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. + +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. + +WARN_IF_UNDOCUMENTED = YES + +# 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. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled 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. + +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) + +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. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# 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. + +INPUT = ../apt-pkg + +# 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++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +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. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# 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. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +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/* + +EXCLUDE_PATTERNS = + +# 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 = + +# 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. + +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). + +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. + +INPUT_FILTER = + +# 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, INPUT_FILTER +# is applied to all files. + +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). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# 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. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +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 and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = 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. + +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. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# 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. + +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]) + +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. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +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. + +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. + +HTML_FILE_EXTENSION = .html + +# 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. + +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. + +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 the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# 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 compressed HTML help file (.chm) +# of the generated HTML documentation. + +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 +# written to the html output directory. + +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. + +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). + +GENERATE_CHI = NO + +# 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. + +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. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag 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 (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# 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. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# 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. + +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. + +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. + +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. + +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, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +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. + +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! + +LATEX_HEADER = + +# 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. + +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 +# higher quality PDF documentation. + +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. + +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. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# 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. + +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. + +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. + +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. + +RTF_HYPERLINKS = NO + +# 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. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +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. + +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) + +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. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# 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. + +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. + +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. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# 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. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# 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. + +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. + +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. + +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. + +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. + +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. + +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. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +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. + +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. + +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. + +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. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all 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. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. 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. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# 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. + +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. + +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. + +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. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +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 is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# 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. + +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) + +HAVE_DOT = @HAVE_DOT@ + +# 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 +# the CLASS_DIAGRAMS tag to NO. + +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. + +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 + +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. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +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. + +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. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags 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. + +CALL_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES 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. + +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 png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH 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. + +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). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +# 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 a graph may be further truncated if the graph's +# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH +# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), +# the graph is not depth-constrained. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# 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). + +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. + +DOT_MULTI_TARGETS = NO + +# 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. + +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. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 0e1d2f8d9..789c3d228 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -191,7 +191,7 @@ Reverse Provides: <varlistentry><term>show <replaceable>pkg(s)</replaceable></term> <listitem><para><literal>show</literal> performs a function similar to - <command>dpkg --print-avail</command>i; it displays the package records for the + <command>dpkg --print-avail</command>; it displays the package records for the named packages.</para></listitem> </varlistentry> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 7c1ae9432..8cfbc72e9 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -407,10 +407,10 @@ for i in Sections do Sets the Packages file output.</para></listitem> </varlistentry> - <varlistentry><term>SrcPackages</term> + <varlistentry><term>Sources</term> <listitem><para> Sets the Sources file output. At least one of - <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem> + <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem> </varlistentry> <varlistentry><term>Contents</term> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index e22446030..fa13ddc0f 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -120,7 +120,7 @@ <listitem><para><literal>Mirror network compromise</literal>. Without signature checking, a malicious agent can compromise a - mirror host and modify the files in it to propage malicious + mirror host and modify the files in it to propagate malicious software to all users downloading packages from that host.</para></listitem> </itemizedlist> diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf index 657ec5440..c9d352ab6 100644 --- a/doc/examples/apt-ftparchive.conf +++ b/doc/examples/apt-ftparchive.conf @@ -20,21 +20,21 @@ Default { // Contents file for these in the main section of the sid release BinDirectory "pool/main" { Packages "dists/sid/main/binary-i386/Packages"; - SrcPackages "dists/sid/main/source/Sources"; + Sources "dists/sid/main/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the contrib section BinDirectory "pool/contrib" { Packages "dists/sid/contrib/binary-i386/Packages"; - SrcPackages "dists/sid/contrib/source/Sources"; + Sources "dists/sid/contrib/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the non-free section BinDirectory "pool/non-free" { Packages "dists/sid/non-free/binary-i386/Packages"; - SrcPackages "dists/sid/non-free/source/Sources"; + Sources "dists/sid/non-free/source/Sources"; Contents "dists/sid/Contents-i386"; }; diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5ab84fe05..ddd9a9d16 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -24,11 +24,15 @@ APT { Architecture "i386"; Build-Essential "build-essential"; - + + NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + // considered for autoRemove + // Options for apt-get Get { Arch-Only "false"; + AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@ -74,7 +78,7 @@ APT Authentication { - Trust-CDROM "false"; // consider the CDROM always trusted + TrustCDROM "false"; // consider the CDROM always trusted }; GPGV @@ -104,6 +108,8 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http @@ -117,6 +123,7 @@ Acquire No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate }; ftp @@ -243,12 +250,14 @@ DPkg Debug { pkgProblemResolver "false"; + pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgAcquire "false"; pkgAcquire::Worker "false"; pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; - + pkgAutoRemove "false"; // show information about automatic removes + pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml index 61cdfa2ec..9ae6506fc 100644 --- a/doc/fr/apt-ftparchive.fr.1.xml +++ b/doc/fr/apt-ftparchive.fr.1.xml @@ -451,10 +451,10 @@ Indique le fichier Packages cr. </para></listitem> </varlistentry> -<varlistentry><term>SrcPackages</term> +<varlistentry><term>Sources</term> <listitem><para> Indique le fichier Sources cr. L'un des deux fichiers, -<literal>Packages</literal> ou <literal>SrcPackages</literal> est ncessaire. +<literal>Packages</literal> ou <literal>Sources</literal> est ncessaire. </para></listitem> </varlistentry> @@ -628,4 +628,4 @@ dcimal 100 en cas d'erreur. &manbugs; &traducteur; -</refentry>
\ No newline at end of file +</refentry> diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml index 8832dd22e..cfaa76c7d 100644 --- a/doc/fr/apt-get.fr.8.xml +++ b/doc/fr/apt-get.fr.8.xml @@ -571,6 +571,11 @@ le guide APT. </para> </refsect1> + <refsect1><title>Diagnostic</title> + <para><command>apt-get</command> renvoie zro aprs une opration normale, le dcimal 100 +en cas d'erreur.</para> + </refsect1> + &manbugs; &deux-traducteurs; </refentry> diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml index 29ba237e2..73a61ea41 100644 --- a/doc/fr/apt-key.fr.8.xml +++ b/doc/fr/apt-key.fr.8.xml @@ -18,7 +18,7 @@ <!-- Man page title --> <refnamediv> <refname>apt-key</refname> - <refpurpose>APT key management utility</refpurpose> + <refpurpose>Utilitaire de gestion des cls</refpurpose> </refnamediv> <!-- Arguments --> @@ -103,7 +103,7 @@ Debian et supprimer les cls qui sont primes. <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename> </term> - <listitem><para>>Trousseau des cls fiables supprimes de l'archive Debian.</para></listitem> + <listitem><para>Trousseau des cls fiables supprimes de l'archive Debian.</para></listitem> </varlistentry> </variablelist> diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index 81130d9ef..d705b9e3e 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -11,36 +11,38 @@ <!ENTITY apt-conf "<citerefentry> <refentrytitle><filename>apt.conf</filename></refentrytitle> <manvolnum>5</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY apt-get "<citerefentry> <refentrytitle><command>apt-get</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY apt-config "<citerefentry> <refentrytitle><command>apt-config</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry>"> + </citerefentry>" +> <!ENTITY apt-cdrom "<citerefentry> <refentrytitle><command>apt-cdrom</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY apt-cache "<citerefentry> <refentrytitle><command>apt-cache</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY apt-preferences "<citerefentry> <refentrytitle><command>apt_preferences</command></refentrytitle> <manvolnum>5</manvolnum> - </citerefentry>"> + </citerefentry>" +> <!ENTITY apt-key "<citerefentry> <refentrytitle><command>apt-key</command></refentrytitle> @@ -69,43 +71,44 @@ <!ENTITY reportbug "<citerefentry> <refentrytitle><command>reportbug</command></refentrytitle> <manvolnum>1</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY dpkg "<citerefentry> <refentrytitle><command>dpkg</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY dpkg-buildpackage "<citerefentry> <refentrytitle><command>dpkg-buildpackage</command></refentrytitle> <manvolnum>1</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY gzip "<citerefentry> <refentrytitle><command>gzip</command></refentrytitle> <manvolnum>1</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY dpkg-scanpackages "<citerefentry> <refentrytitle><command>dpkg-scanpackages</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY dpkg-scansources "<citerefentry> <refentrytitle><command>dpkg-scansources</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry> -"> + </citerefentry>" +> <!ENTITY dselect "<citerefentry> <refentrytitle><command>dselect</command></refentrytitle> <manvolnum>8</manvolnum> - </citerefentry>"> + </citerefentry>" +> <!ENTITY aptitude "<citerefentry> <refentrytitle><command>aptitude</command></refentrytitle> @@ -188,12 +191,12 @@ <!ENTITY manbugs " <refsect1><title>Bogues</title> <para> -Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues de APT</ulink>. - Si vous voulez rapporter un bogue, consultez le texte +Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues d'APT</ulink>. + Si vous voulez signaler un bogue, consultez le texte <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la commande &reportbug;.</para> - </refsect1> - "> + </refsect1>" +> <!-- Boiler plate Author section --> <!ENTITY manauthor " @@ -201,17 +204,17 @@ commande &reportbug;.</para> <para> APT a t crit par l'quipe APT <email>apt@packages.debian.org</email>. </para> - </refsect1> -"> + </refsect1>" +> <!-- Section traduction --> <!ENTITY deux-traducteurs " <refsect1><title>Traduction</title> <para> Jrme Marant. 2000 ; mise jour : Philippe Batailler. 2005. -</para> -</refsect1> -"> +<email>debian-l10n-french@lists.debian.org</email>.</para> +</refsect1>" +> <!ENTITY traducteur " <refsect1><title>Traduction</title> diff --git a/doc/fr/sources.list.fr.5.xml b/doc/fr/sources.list.fr.5.xml index 4abd9c95e..4235480f8 100644 --- a/doc/fr/sources.list.fr.5.xml +++ b/doc/fr/sources.list.fr.5.xml @@ -25,16 +25,15 @@ <refnamediv> <refname>sources.list</refname> -<refpurpose>Une liste, utilise par APT, indiquant les ressources de paquets</refpurpose> +<refpurpose>Liste des sources de paquets</refpurpose> </refnamediv> <refsect1><title>Description</title> <para> -La liste des ressources de paquets indique o trouver les archives +La liste des sources de paquets indique o trouver les archives du systme de distribution de paquets utilis. Pour l'instant, cette page de manuel ne documente que le systme d'empaquetage utilis par le systme -Debian GNU/Linux. Ce fichier de contrle est situ dans -<filename>/etc/apt/sources.list</filename>. +Debian GNU/Linux. Ce fichier de contrle est <filename>/etc/apt/sources.list</filename>. </para> <para> La liste des sources est conue pour prendre en compte un nombre quelconque @@ -49,17 +48,26 @@ ligne peut tre un commentaire commenant par un caractre #. </para> </refsect1> +<refsect1><title>sources.list.d</title> +<para> Le rpertoire <filename>/etc/apt/sources.list.d</filename> permet de +lister des sources de paquets dans des fichiers distincts qui se terminent +par <literal>.list</literal>. Leur format est le mme que celui du fichier +<filename>sources.list</filename>. +</para> + </refsect1> + <refsect1><title>Les types deb et deb-src.</title> <para> Le type <literal>deb</literal> dcrit une archive Debian classique deux niveaux, <filename>distribution/composant</filename>. <literal>distribution</literal> peut prendre l'une des valeurs suivantes : <literal>stable</literal>, <literal>unstable</literal>, ou -<literal>testing</literal>, et composant : <literal>main</literal>, <literal>contrib</literal>, -<literal>non-free</literal>, ou <literal>non-us</literal>. Le type <literal>deb-src</literal> -dcrit le +<literal>testing</literal>, et composant : <literal>main</literal>, +<literal>contrib</literal>, +<literal>non-free</literal>, ou <literal>non-us</literal>. +Le type <literal>deb-src</literal> dcrit le code source pour une distribution Debian dans le mme format que le type <literal>deb</literal>. Une ligne <literal>deb-src</literal> est ncessaire pour rcuprer les -index de sources. +index des sources. </para> <para> Le format d'une entre dans <filename>sources.list</filename> utilisant les types @@ -73,7 +81,7 @@ dans laquelle APT trouvera les informations dont il a besoin. doit omettre les composants et <literal>distribution</literal> doit se terminer par une barre oblique (/). C'est utile quand seule une sous-section particulire de l'archive dcrite par cet URI est intressante. Quand <literal>distribution</literal> -n'indique pas un chemin exact, un <literal>component</literal> au moins doit tre +n'indique pas un chemin exact, un <literal>composant</literal> au moins doit tre prsent. </para> <para> @@ -101,8 +109,8 @@ efficacement parti des sites faible bande passante. <para> Il est important d'indiquer les sources par ordre de prfrence, la source principale apparaissant en premier. Un tri est fait, de la plus -rapide la plus lente ; par exemple, CD-ROM suivi par les htes d'un -rseau local, puis les htes Internet distants. +rapide la plus lente ; par exemple, un cdrom suivi par les htes d'un +rseau local, puis les htes distants. </para> <para>Voici quelques exemples : </para> @@ -127,9 +135,9 @@ montages NFS, les miroirs et les archives locaux. <varlistentry><term>cdrom</term> <listitem><para> -Le procd <literal>cdrom</literal> permet l'utilisation d'un lecteur de CDROM local +Le procd <literal>cdrom</literal> permet l'utilisation d'un lecteur de cdrom avec la possibilit de changer de media. Utilisez le programme &apt-cdrom; -pour crer des entres dans la liste de sources. +pour crer des entres dans la liste des sources. </para> </listitem> </varlistentry> @@ -149,8 +157,8 @@ mthode d'authentification peu sre. <varlistentry><term>ftp</term> <listitem><para> Le procd <literal>ftp</literal> indique un serveur FTP comme archive. Le -fonctionnement en mode ftp est grandement configurable ; rfrez-vous - la page de manuel de &apt-cdrom; pour davantage de renseignements. On +fonctionnement en mode ftp est largement configurable ; rfrez-vous + la page de manuel de &apt-cdrom; pour d'autres informations. On remarquera qu'on peut indiquer un mandataire ftp avec la variable d'environnement <envar>ftp_proxy</envar>. On peut aussi spcifier un mandataire http (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant diff --git a/doc/ja/apt-cache.ja.8.sgml b/doc/ja/apt-cache.ja.8.sgml deleted file mode 100644 index 020137021..000000000 --- a/doc/ja/apt-cache.ja.8.sgml +++ /dev/null @@ -1,638 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!-- translation of version 1.10 --> -<!-- Bug#175611 is fixed in translation --> -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ - -<!ENTITY % aptent SYSTEM "apt.ent.ja"> -%aptent; - -]> - -<refentry lang=ja> - &apt-docinfo; - - <refmeta> - <refentrytitle>apt-cache</> - <manvolnum>8</> - </refmeta> - - <!-- Man page title --> - <refnamediv> - <refname>apt-cache</> -<!-- <refpurpose>APT package handling utility - - cache manipulator</> --> - <refpurpose>APT ѥå桼ƥƥ -- å</> - </refnamediv> - - <!-- Arguments --> - <refsynopsisdiv> - <cmdsynopsis> - <command>apt-cache</> - <arg><option>-hvsn</></arg> - <arg><option>-o=<replaceable/config string/</></arg> - <arg><option>-c=<replaceable/file/</></arg> - <group choice=req> - <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg> - <arg>gencaches</> - <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>stats</> - <arg>dump</> - <arg>dumpavail</> - <arg>unmet</> - <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg> - <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> -<!-- -Bug#175611 - <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> --> - <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg> - <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg> - </group> - </cmdsynopsis> - </refsynopsisdiv> - -<!-- <RefSect1><Title>Description</>--> - <RefSect1><Title></> - <para> -<!-- - <command/apt-cache/ performs a variety of operations on APT's package - cache. <command/apt-cache/ does not manipulate the state of the system - but does provide operations to search and generate interesting output - from the package metadata. ---> - <command/apt-cache/ APT ΥѥååФƤԤޤ - <command/apt-cache/ ϡƥ֤ϹԤޤ - ѥåΥǡ긡ꡢ̣ϤȤä - ޤ - <para> -<!-- - Unless the <option/-h/, or <option/-/-help/ option is given one of the - commands below must be present. ---> - <option/-h/ <option/--help/ ʲ˵륳ޥɤɬפǤ - <VariableList> - <VarListEntry><Term>add</Term> - <ListItem><Para> -<!-- - <literal/add/ adds the named package index files to the package cache. - This is for debugging only. ---> - <literal/add/ ϥѥååˡꤷѥåǥå - եɲäޤǥХåѤǤ - </VarListEntry> - - <VarListEntry><Term>gencaches</Term> - <ListItem><Para> -<!-- - <literal/gencaches/ performs the same opration as - <command/apt-get check/. It builds the source and package caches from - the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>. ---> - <literal/gencaches/ <command/apt-get check/ Ʊưޤ - &sources-list; μ <filename>/var/lib/dpkg/status</> - 顢ȥѥåΥåۤޤ - </VarListEntry> - - <VarListEntry><Term>showpkg</Term> - <ListItem><Para> -<!-- - <literal/showpkg/ displays information about the packages listed on the - command line. Remaining arguments are package names. The available - versions and reverse dependencies of each package listed are listed, as - well as forward dependencies for each version. Forward (normal) - dependencies are those packages upon which the package in question - depends; reverse dependencies are those packages that depend upon the - package in question. Thus, forward dependencies must be satisfied for a - package, but reverse dependencies need not be. - For instance, <command>apt-cache showpkg libreadline2</> would produce - output similar to the following: ---> - <literal/showpkg/ ϡޥɥ饤ѥåξ - ɽޤĤΰϥѥå̾Ǥ - ѥåˤĤơƥСΰ¸طɽ褦 - ͭʥС¸طޤ - ()¸طȤϡоݤΥѥå¸Ƥѥåޤ - ޤ¸طȤϡоݤΥѥå˰¸Ƥѥåޤ - äơѥåΰ¸طʤФʤޤ - ¸طϤɬפϤޤ - Ȥơʲ <command>apt-cache showpkg libreadline2</> - ϤǤޤ - -<informalexample><programlisting> -Package: libreadline2 -Versions: 2.1-12(/var/state/apt/lists/foo_Packages), -Reverse Depends: - libreadlineg2,libreadline2 - libreadline2-altdev,libreadline2 -Dependencies: -2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) -Provides: -2.1-12 - -Reverse Provides: -</programlisting></informalexample> - - <para> -<!-- Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and - ncurses3.0 which must be installed for libreadline2 to work. - In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If - libreadline2 is installed, libc5, ncurses3.0, and ldso must also be - installed; libreadlineg2 and libreadline2-altdev do not have to be - installed. For the specific meaning of the remainder of the output it - is best to consult the apt source code. ---> - Ĥޤꡢlibreadline2 version 2.1-12 libc5 ncurses3.0 ˰¸ - ơlibreadline2 ưˤϤȡ뤹ɬפ - ȤȽޤ - libreadlineg2 libreadline2-altdev libreadline2 ˰¸Ƥޤ - libreadline2 ȡ뤹뤿ˤϡlibc5, ncurses3.0, ldso - ٤ƥȡ뤷ʤФʤޤlibreadlineg2 - libreadline2-altdev ϥȡ뤹ɬפϤޤ - ϤλĤʬΰ̣ˤĤƤϡapt ΥɤĴ٤ΤɤǤ礦 - </VarListEntry> - - <VarListEntry><Term>stats</Term> - <ListItem><Para> -<!-- - <literal/stats/ displays some statistics about the cache. - No further arguments are expected. Statistics reported are: ---> - <literal/stats/ ϥåˤĤƤɽޤ - ʾ塢ɬפޤʲɽޤ - <itemizedlist> -<!-- -ʲ stats ΥƥˤĤƤϡɽ̾ (ʸ) Ȥ -Ҥޤ(ɽܤΥʤ褦) -ǽŪ˥å˽ɬפޤ(߷) ---> - <listitem><para> -<!-- - <literal/Total package names/ is the number of package names found - in the cache. ---> - <literal/Total package names (ѥå)/ ϡ - å¸ߤѥåɽޤ - </listitem> - - <listitem><para> -<!-- - <literal/Normal packages/ is the number of regular, ordinary package - names; these are packages that bear a one-to-one correspondence between - their names and the names used by other packages for them in - dependencies. The majority of packages fall into this category. ---> - <literal/Normal packages (̾ѥå)/ ϡ - ̤Υѥåɽޤ - ϡ¾Υѥåΰ¸طǻѤ줿̾Τǡ줬аб - ѥåǤ - ¿ΥѥåϤΥƥޤ - </listitem> - - <listitem><para> -<!-- - <literal/Pure virtual packages/ is the number of packages that exist - only as a virtual package name; that is, packages only "provide" the - virtual package name, and no package actually uses the name. For - instance, "mail-transport-agent" in the Debian GNU/Linux system is a - pure virtual package; several packages provide "mail-transport-agent", - but there is no package named "mail-transport-agent". ---> - <literal/Pure virtual packages (㲾ۥѥå)/ ϡ - ۥѥå̾ȤƤΤ¸ߤ - ѥå (ۥѥå̾ΤߤפºݤˤϤʤ - ѥå⤽̾Τʤ) οɽޤ - 㤨СDebian GNU/Linux ƥǤ "mail-transport-agent" - 㲾ۥѥåǤ"mail-transport-agent" ѥå - Ĥ⤢ޤ"mail-transport-agent" Ȥ̾ΤΥѥå - ޤ - </listitem> - - <listitem><para> -<!-- - <literal/Single virtual packages/ is the number of packages with only - one package providing a particular virtual package. For example, in the - Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but - only one package, xless, provides "X11-text-viewer". ---> - <literal/Single virtual packages (ñۥѥå)/ ϡ - βۥѥå̾ѥå - Ĥξοɽޤ - 㤨СDebian GNU/Linux ƥǤϡ"X11-text-viewer" - ۥѥåǤ"X11-text-viewer" ѥåϡ - xless ѥåΤߤȤȤǤ - </listitem> - - <listitem><para> -<!-- - <literal/Mixed virtual packages/ is the number of packages that either - provide a particular virtual package or have the virtual package name - as the package name. For instance, in the Debian GNU/Linux system, - debconf is both an actual package, and provided by the debconf-tiny - package. ---> - <literal/Mixed virtual packages (ʣۥѥå)/ ϡ - βۥѥå̾ѥåʣ뤫 - ޤѥå̾Ʊۥѥå̾ĥѥåɽޤ - 㤨СDebian GNU/Linux ƥǤϡdebconf ϼºݤΥѥå̾Ǥ - ޤdebconf-tiny ˤä⤵Ƥޤ - </listitem> - - <listitem><para> -<!-- - <literal/Missing/ is the number of package names that were referenced in - a dependency but were not provided by any package. Missing packages may - be in evidence if a full distribution is not accesssed, or if a package - (real or virtual) has been dropped from the distribution. Usually they - are referenced from Conflicts statements. ---> - <literal/Missing ()/ ϡ¸طˤ¸ߤΤˡɤΥѥå - ˤƤʤѥå̾οɽޤ - ѥåȤȤϡǥȥӥ塼˥ - Ƥʤ(¤ʤ) ѥåǥȥӥ塼 - ϤƤޤä⤷ʤȤɽޤ - ̾Ϲʸ̷⤹뤳ȤǻȤޤ - </listitem> - - <listitem><para> -<!-- - <literal/Total distinct/ versions is the number of package versions - found in the cache; this value is therefore at least equal to the - number of total package names. If more than one distribution (both - "stable" and "unstable", for instance), is being accessed, this value - can be considerably larger than the number of total package names. ---> - <literal/Total distinct versions (̥С)/ ϥå - ¸ߤѥåΥСοɽޤΤᡢͤ - ǾǤѥåפȰפޤ - Ȥ 2 ʾΥǥȥӥ塼 - ("stable" "unstable"ξʤ) Ѥ硢 - ͤϥѥåפ⤫ʤ礭ˤʤޤ - </listitem> - - <listitem><para> -<!-- - <literal/Total dependencies/ is the number of dependency relationships - claimed by all of the packages in the cache. ---> - <literal/Total dependencies (¸ط)/ ϥåΤ٤Ƥ - ѥåᤵ줿¸طοǤ - </listitem> - </itemizedlist> - </VarListEntry> - - <VarListEntry><Term>showsrc</Term> - <ListItem><Para> -<!-- - <literal/showsrc/ displays all the source package records that match - the given package names. All versions are shown, as well as all - records that declare the name to be a Binary. - named packages. ---> - <literal/showsrc/ ϻꤷѥå̾Ȱפ륽ѥå - ٤ɽޤꤷѥåˤĤơХʥˤʤȤ̾Τ - 쥳Ʊͤˡ٤ƤΥСˤĤɽޤ - </VarListEntry> - - <VarListEntry><Term>dump</Term> - <ListItem><Para> -<!-- - <literal/dump/ shows a short listing of every package in the cache. It is - primarily for debugging. ---> - <literal/dump/ ϥåˤѥåΡûɽޤ - ˥ǥХåѤǤ - </VarListEntry> - - <VarListEntry><Term>dumpavail</Term> - <ListItem><Para> -<!-- - <literal/dumpavail/ prints out an available list to stdout. This is - suitable for use with &dpkg; and is used by the &dselect; method. ---> - <literal/dumpavail/ ɸϤˡѲǽʤΤΰϤޤ - &dpkg; ȶ˻ѤǤޤ &dselect; ǤѤޤ - </VarListEntry> - - <VarListEntry><Term>unmet</Term> - <ListItem><Para> -<!-- - <literal/unmet/ displays a summary of all unmet dependencies in the - package cache. ---> - <literal/unmet/ ϥѥååΡŬʰ¸طγפ - ɽޤ - </VarListEntry> - - <VarListEntry><Term>show</Term> - <ListItem><Para> -<!-- - <literal/show/ performs a function similar to - <command>dpkg - -print-avail</>, it displays the package records for the - named packages. ---> - <literal/show/ <command>dpkg --print-avail</> ˻ǽ¹Ԥޤ - ꤷѥåΥѥå쥳ɤɽޤ - </VarListEntry> - - <VarListEntry><Term>search</Term> - <ListItem><Para> -<!-- - <literal/search/ performs a full text search on all available package - files for the regex pattern given. It searchs the package names and the - descriptions for an occurance of the string and prints out the package - name and the short description. If <option/- -full/ is given then output - identical to <literal/show/ is produced for each matched package and - if <option/- -names-only/ is given then the long description is not - searched, only the package name is. ---> - <literal/search/ Ϳ줿ɽˤäơ٤ƤѲǽ - ѥåФʸԤޤѥå̾ФƸ - Ԥѥå̾ûʸɽޤ - <option/--full/ Ϳ줿硢ޥåѥåФ - <literal/show/ ƱϤޤ - <option/--names-only/ Ϳ줿ϡʸФƸԤ鷺 - ѥå̾ФƤΤоݤȤޤ - <para> -<!-- - Seperate arguments can be used to specified multiple search patterns that - are and'd together. ---> - Ƕڤäʣθѥ and Ȥ뤳ȤǤޤ - </VarListEntry> - - <VarListEntry><Term>depends</Term> - <ListItem><Para> -<!-- - <literal/depends/ shows a listing of each dependency a package has - and all the possible other packages that can fullfill that dependency. ---> - <literal/depends/ ϡѥåäƤ¸طȡΰ¸ط - ¾Υѥåΰɽޤ - </VarListEntry> - - <VarListEntry><Term>pkgnames</Term> - <ListItem><Para> -<!-- - This command prints the name of each package in the system. The optional - argument is a prefix match to filter the name list. The output is suitable - for use in a shell tab complete function and the output is generated - extremly quickly. This command is best used with the - <option/- -generate/ option. ---> - ΥޥɤϡƥǤγƥѥå̾Τɽޤ - ץΰˤꡢƬפФ뤳ȤǤޤ - νϤϥΥ֤ˤ䴰ǽǻȤ䤹ޤ®ޤ - Υޥɤ <option/--generate/ ץȶ˻Ѥ - Ǥ - </VarListEntry> - <VarListEntry><Term>dotty</Term> - <ListItem><Para> -<!-- - <literal/dotty/ takes a list of packages on the command line and - gernerates output suitable for use by dotty from the - <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</> - package. The result will be a set of nodes and edges representing the - relationships between the packages. By default the given packages will - trace out all dependent packages which can produce a very large graph. - This can be turned off by setting the - <literal>APT::Cache::GivenOnly</> option. ---> - <literal/dotty/ ϡޥɥ饤Υѥå̾顢 - <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</> - ѥå dotty ޥɤѤΤʽϤޤ - ̤ϥѥåδطɽ魯ΡɡåΥåȤɽޤ - ǥեȤǤϡ٤Ƥΰ¸ѥåȥ졼Τǡ礭 - ޤޤ - ϡ<literal>APT::Cache::GivenOnly</> ץDz - ȤǤޤ - <para> -<!-- - The resulting nodes will have several shapse, normal packages are boxes, - pure provides are triangles, mixed provides are diamonds, - hexagons are missing packages. Orange boxes mean recursion was stopped - [leaf packages], blue lines are prre-depends, green lines are conflicts. ---> - ̤ΥΡɤϿηȤʤޤ - ̾ѥåϻͳѡ㲾ۥѥåϻѡʣۥѥåɩ - ϻѷϷѥå줾ɽޤ - λͳѤϺƵλ֥եѥåסĤ pre-depends - Ф϶ɽޤ - <para> -<!-- - Caution, dotty cannot graph larger sets of packages. ---> - ) dotty ϥѥåΤ礭ʥåȤΥդޤ - <VarListEntry><Term>policy</Term> - <ListItem><Para> -<!-- - <literal/policy/ is ment to help debug issues relating to the - preferences file. With no arguments it will print out the - priorities of each source. Otherwise it prints out detailed information - about the priority selection of the named package. ---> - <literal/policy/ եطˤĤơǥХåٱ礷ޤ - ꤷʤä硢Ȥ̤ͥɽޤ - ѥå̾ꤷ硢ͥξܺپɽޤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>Options</> ---> - <RefSect1><Title>ץ</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</> - <ListItem><Para> -<!-- - Select the file to store the package cache. The package cache is the - primary cache used by all operations. - Configuration Item: <literal/Dir::Cache::pkgcache/. ---> - ѥååǼեޤ - ѥååϡ٤ƤǻѤ켡åǤ - - <literal/Dir::Cache::pkgcache/ - </VarListEntry> - - <VarListEntry><term><option/-s/</><term><option/--src-cache/</> - <ListItem><Para> -<!-- - Select the file to store the source cache. The source is used only by - <literal/gencaches/ and it stores a parsed version of the package - information from remote sources. When building the package cache the - source cache is used to advoid reparsing all of the package files. - Configuration Item: <literal/Dir::Cache::srcpkgcache/. ---> - åǼեޤ - Υå <literal/gencaches/ ǤΤѤ졢 - ˲Ϥ줿ΥѥåǼƤޤ - ѥååۤݤˡåϡ - ѥåեƲϤǤ - <!--advoid avoid Υߥڥ롩 --> - - <literal/Dir::Cache::srcpkgcache/ - </VarListEntry> - - <VarListEntry><term><option/-q/</><term><option/--quiet/</> - <ListItem><Para> -<!-- - Quiet; produces output suitable for logging, omitting progress indicators. - More qs will produce more quite up to a maximum of 2. You can also use - <option/-q=#/ to set the quiet level, overriding the configuration file. - Configuration Item: <literal/quiet/. ---> - Ų - ĽɽάƥȤΤʽϤԤޤ - 2 Ĥޤ q Ťͤ뤳ȤǤŤˤǤޤ - ޤ<option/-q=#/ Τ褦Ų٥ꤷơե - 뤳ȤǤޤ - - <literal/quiet/ - </VarListEntry> - - <VarListEntry><term><option/-i/</><term><option/--important/</> - <ListItem><Para> -<!-- - Print only important deps; for use with unmet causes only Depends and - Pre-Depends relations to be printed. - Configuration Item: <literal/APT::Cache::Important/. ---> - ֽספΤɽ - Dipends Pre-Depends Τɽ뤿ᡢ - unmet ȶ˻Ѥޤ - - <literal/APT::Cache::Important/ - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--full/</> - <ListItem><Para> -<!-- - Print full package records when searching. - Configuration Item: <literal/APT::Cache::ShowFull/. ---> - search ѥå쥳ɤɽޤ - - <literal/APT::Cache::ShowFull/ - </VarListEntry> - - <VarListEntry><term><option/-a/</><term><option/--all-versions/</> - <ListItem><Para> -<!-- - Print full records for all available versions, this is only applicable to - the show command. - Configuration Item: <literal/APT::Cache::AllVersions/. ---> - ѲǽС쥳ɤɽޤ - show ޥɤǤΤŬѤǤޤ - - <literal/APT::Cache::AllVersions/ - </VarListEntry> - - <VarListEntry><term><option/-g/</><term><option/--generate/</> - <ListItem><Para> -<!-- - Perform automatic package cache regeneration, rather than use the cache - as it is. This is the default, to turn it off use <option/- -no-generate/. - Configuration Item: <literal/APT::Cache::Generate/. ---> - ΤޤޥåѤΤǤϤʤưŪ˥ѥåå - ޤϥǥեȤưǤ<option/--no-generate/ - Ѥ̵ˤǤޤ - - <literal/APT::Cache::Generate/ - </VarListEntry> - - <VarListEntry><term><option/--names-only/</><term><option/-n/</> - <ListItem><Para> -<!-- - Only search on the package names, not the long description. - Configuration Item: <literal/APT::Cache::NamesOnly/. ---> - ʸǤϤʤѥå̾Τ߸ޤ - - <literal/APT::Cache::NamesOnly/ - </VarListEntry> - - <VarListEntry><term><option/--all-names/</> - <ListItem><Para> -<!-- - Make <literal/pkgnames/ print all names, including virtual packages - and missing dependencies. - Configuration Item: <literal/APT::Cache::AllNames/. ---> - <literal/pkgnames/ ǡۥѥåʰ¸طޤ̾Τ - ɽޤ - - <literal/APT::Cache::AllNames/ - </VarListEntry> - - <VarListEntry><term><option/--recurse/</> - <ListItem><Para> -<!-- - Make <literal/depends/ recursive so that all packages mentioned are - printed once. - Configuration Item: <literal/APT::Cache::RecurseDepends/. ---> - <literal/depends/ ǡꤷѥåƵŪ˰٤ɽޤ - - <literal/APT::Cache::RecurseDepends/ - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>Files</> ---> - <RefSect1><Title>ե</> - <variablelist> - <VarListEntry><term><filename>/etc/apt/sources.list</></term> - <ListItem><Para> -<!-- - locations to fetch packages from. - Configuration Item: <literal/Dir::Etc::SourceList/. ---> - ѥåμ - - <literal/Dir::Etc::SourceList/ - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/</></term> - <ListItem><Para> -<!-- - storage area for state information for each package resource specified in - &sources-list; - Configuration Item: <literal/Dir::State::Lists/. ---> - &sources-list; ˻ꤷѥåȤξ־Ǽꥢ - - <literal/Dir::State::Lists/ - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/partial/</></term> - <ListItem><Para> -<!-- - storage area for state information in transit. - Configuration Item: <literal/Dir::State::Lists/ (implicit partial). ---> - ־Ǽꥢ - - <literal/Dir::State::Lists/ (ɬŪԴǤ) - </VarListEntry> - </variablelist> - </RefSect1> - -<!-- - <RefSect1><Title>See Also</> ---> - <RefSect1><Title>Ϣ</> - <para> - &apt-conf;, &sources-list;, &apt-get; - </RefSect1> - -<!-- - <RefSect1><Title>Diagnostics</> ---> - <RefSect1><Title>ǥå</> - <para> -<!-- - <command/apt-cache/ returns zero on normal operation, decimal 100 on error. ---> - <command/apt-cache/ ｪλ 0 ֤ޤ - 顼ˤϽʤ 100 ֤ޤ - </RefSect1> - - &manbugs; - &manauthor; - &translator; -</refentry> diff --git a/doc/ja/apt-cache.ja.8.xml b/doc/ja/apt-cache.ja.8.xml new file mode 100644 index 000000000..1d30e224d --- /dev/null +++ b/doc/ja/apt-cache.ja.8.xml @@ -0,0 +1,701 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-cache</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-cache</refname> +<!-- + <refpurpose>APT package handling utility -\- cache manipulator</refpurpose> +--> + <refpurpose>APT パッケージ操作ユーティリティ -- キャッシュ操作</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-cache</command> + <arg><option>-hvsn</option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <group choice="req"> + <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg> + <arg>gencaches</arg> + <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>stats</arg> + <arg>dump</arg> + <arg>dumpavail</arg> + <arg>unmet</arg> + <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg> + <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg> + <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg> + <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-cache</command> performs a variety of operations on APT's package + cache. <command>apt-cache</command> does not manipulate the state of the system + but does provide operations to search and generate interesting output + from the package metadata.</para> +--> + <para><command>apt-cache</command> は APT のパッケージキャッシュに対して、 + さまざまな操作を行います。 + <command>apt-cache</command> は、システム状態の操作は行いませんが、 + パッケージのメタデータより検索したり、 + 興味深い出力を生成するといった操作を提供します。</para> + +<!-- + <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the + commands below must be present.</para> +--> + <para><option>-h</option> オプションや <option>--help</option> オプションを除き、 + 以下に挙げるコマンドが必要です。</para> + + <variablelist> +<!-- + <varlistentry><term>add <replaceable>file(s)</replaceable></term> + <listitem><para><literal>add</literal> adds the named package index files to the package cache. + This is for debugging only.</para></listitem> +--> + <varlistentry><term>add <replaceable>file(s)</replaceable></term> + <listitem><para><literal>add</literal> は、 + パッケージキャッシュに指定したパッケージインデックスファイルを追加します。 + デバッグ専用です。</para></listitem> + </varlistentry> + + <varlistentry><term>gencaches</term> +<!-- + <listitem><para><literal>gencaches</literal> performs the same operation as + <command>apt-get check</command>. It builds the source and package caches from + the sources in &sources-list; and from + <filename>/var/lib/dpkg/status</filename>.</para></listitem> +--> + <listitem><para><literal>gencaches</literal> は、 + <command>apt-get check</command> と同じ動作を提供します。 + これは &sources-list; 内の取得元と + <filename>/var/lib/dpkg/status</filename>から、 + ソースとパッケージのキャッシュを構築します。</para></listitem> + </varlistentry> + + <varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>showpkg</literal> displays information about the packages listed on the + command line. Remaining arguments are package names. The available + versions and reverse dependencies of each package listed are listed, as + well as forward dependencies for each version. Forward (normal) + dependencies are those packages upon which the package in question + depends; reverse dependencies are those packages that depend upon the + package in question. Thus, forward dependencies must be satisfied for a + package, but reverse dependencies need not be. + For instance, <command>apt-cache showpkg libreadline2</command> would produce + output similar to the following:</para> +--> + <listitem><para><literal>showpkg</literal> は、 + コマンドライン上に列挙したパッケージの情報を表示します。 + 後に続く引数はパッケージ名となります。 + 各パッケージについて、有効なバージョンと被依存関係を列挙し、 + さらにその各バージョンについて依存関係を表示します。 + (通常の) 依存関係とは、対象のパッケージが依存しているパッケージを指します。 + また、被依存関係とは、対象のパッケージに依存しているパッケージを指します。 + 従って、パッケージの依存関係は満たさなければなりませんが、 + 被依存関係は満たす必要はありません。 + 実例として、以下に <command>apt-cache showpkg libreadline2</command> の + 出力を掲げます。</para> + +<informalexample><programlisting> +Package: libreadline2 +Versions: 2.1-12(/var/state/apt/lists/foo_Packages), +Reverse Depends: + libreadlineg2,libreadline2 + libreadline2-altdev,libreadline2 +Dependencies: +2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) +Provides: +2.1-12 - +Reverse Provides: +</programlisting></informalexample> + +<!-- + <para>Thus it may be seen that libreadline2, version 2.1-12, depends on + libc5 and ncurses3.0 which must be installed for libreadline2 to work. + In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If + libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be + installed; libreadlineg2 and libreadline2-altdev do not have to be + installed. For the specific meaning of the remainder of the output it + is best to consult the apt source code.</para></listitem> + </varlistentry> +--> + <para>つまり、libreadline2 の version 2.1-12 は、 + libc5 と ncurses3.0 に依存していて、libreadline2 が動作するには、 + これらをインストールする必要があるということが判ります。 + 一方、libreadlineg2 と libreadline2-altdev は libreadline2 に依存しています。 + libreadline2 をインストールするためには、libc5, ncurses3.0, ldso を + すべてインストールしなければなりませんが、libreadlineg2 と + libreadline2-altdev はインストールする必要はありません。 + 出力の残りの部分の意味については、 + apt のソースコードを調べるのが最良でしょう。</para></listitem> + </varlistentry> + +<!-- + <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache. + No further arguments are expected. Statistics reported are: +--> + <varlistentry><term>stats</term><listitem><para><literal>stats</literal> + はキャッシュについての統計情報を表示します。 + それ以上、引数は必要ありません。以下の統計情報を表示します。 + <itemizedlist> +<!-- + <listitem><para><literal>Total package names</literal> is the number of package names found + in the cache.</para> + </listitem> +--> + <listitem><para><literal>パッケージ名総数</literal>は、 + キャッシュに存在するパッケージ数を表します。</para> + </listitem> + +<!-- + <listitem><para><literal>Normal packages</literal> is the number of regular, ordinary package + names; these are packages that bear a one-to-one correspondence between + their names and the names used by other packages for them in + dependencies. The majority of packages fall into this category.</para> + </listitem> +--> + <listitem><para><literal>通常パッケージ</literal>は、 + 公式の普通のパッケージ数を表します。 + これは、他のパッケージの依存関係で使用された名称で、それが一対一に対応 + するパッケージです。 + 大多数のパッケージはこのカテゴリに入ります。</para> + </listitem> + +<!-- + <listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist + only as a virtual package name; that is, packages only "provide" the + virtual package name, and no package actually uses the name. For + instance, "mail-transport-agent" in the Debian GNU/Linux system is a + pure virtual package; several packages provide "mail-transport-agent", + but there is no package named "mail-transport-agent".</para> + </listitem> +--> + <listitem><para><literal>純粋仮想パッケージ</literal>は、 + 仮想パッケージ名としてのみ存在するパッケージ + (仮想パッケージ名のみを「提供」し、 + 実際にはいかなるパッケージもその名称を持たない) の数を表します。 + 例えば、Debian GNU/Linux システムでは "mail-transport-agent" + は純粋仮想パッケージです。 + "mail-transport-agent" を提供するパッケージはいくつもありますが、 + "mail-transport-agent" という名称のパッケージはありません。</para> + </listitem> + +<!-- + <listitem><para><literal>Single virtual packages</literal> is the number of packages with only + one package providing a particular virtual package. For example, in the + Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but + only one package, xless, provides "X11-text-viewer".</para> + </listitem> +--> + <listitem><para><literal>単一仮想パッケージ</literal>は、 + 特定の仮想パッケージ名を提供するパッケージが、 + ただ一つの場合の数を表します。 + 例えば、Debian GNU/Linux システムでは、"X11-text-viewer" + は仮想パッケージですが、"X11-text-viewer" を提供するパッケージは、 + xless パッケージのみということです。</para> + </listitem> + +<!-- + <listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either + provide a particular virtual package or have the virtual package name + as the package name. For instance, in the Debian GNU/Linux system, + "debconf" is both an actual package, and provided by the debconf-tiny + package.</para> + </listitem> +--> + <listitem><para><literal>複合仮想パッケージ</literal>は、 + その仮想パッケージ名を提供するパッケージが複数あるか、 + またパッケージ名と同じ仮想パッケージ名を持つパッケージ数を表します。 + 例えば、Debian GNU/Linux システムでは、 + debconf は実際のパッケージ名でもありますが、 + debconf-tiny によって提供もされています。</para> + </listitem> + +<!-- + <listitem><para><literal>Missing</literal> is the number of package names that were referenced in + a dependency but were not provided by any package. Missing packages may + be in evidence if a full distribution is not accessed, or if a package + (real or virtual) has been dropped from the distribution. Usually they + are referenced from Conflicts statements.</para> + </listitem> +--> + <listitem><para><literal>欠落</literal>は、依存関係中には存在するのに、 + どのパッケージにも提供されていないパッケージ名の数を表します。 + このパッケージがあるということは、 + 全ディストリビューションにアクセスできていないか、 + (実ないし仮想) パッケージがディストリビューションからはずされてしまった可能性もあります。 + 通常では、構文が矛盾するとこのようになります。</para> + </listitem> + +<!-- + <listitem><para><literal>Total distinct</literal> versions is the number of package versions + found in the cache; this value is therefore at least equal to the + number of total package names. If more than one distribution (both + "stable" and "unstable", for instance), is being accessed, this value + can be considerably larger than the number of total package names.</para> + </listitem> +--> + <listitem><para><literal>個別バージョン総数</literal>は、 + キャッシュに存在するパッケージのバージョンの数を表します。 + そのため、この値は最小でもパッケージ名総数と一致します。 + もし複数のディストリビューション (例 "stable" と "unstable" の両方) + を利用した場合、 + この値はパッケージ名総数よりもかなり大きい数になります。</para> + </listitem> + +<!-- + <listitem><para><literal>Total dependencies</literal> is the number of dependency relationships + claimed by all of the packages in the cache.</para> + </listitem> +--> + <listitem><para><literal>依存関係総数</literal>は、 + キャッシュにあるすべてのパッケージで要求された依存関係の数です。</para> + </listitem> + </itemizedlist> + </para></listitem> + </varlistentry> + + <varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>showsrc</literal> displays all the source package records that match + the given package names. All versions are shown, as well as all + records that declare the name to be a Binary.</para></listitem> + </varlistentry> +--> + <listitem><para><literal>showsrc</literal> は、 + 指定したパッケージ名に一致するソースパッケージを、すべて表示します。 + バイナリになるときの名称を宣言したレコードと同様に、 + すべてのバージョンについて表示します。</para></listitem> + </varlistentry> + + <varlistentry><term>dump</term> +<!-- + <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is + primarily for debugging.</para></listitem> + </varlistentry> +--> + <listitem><para><literal>dump</literal> は、 + キャッシュ内のパッケージそれぞれについて、短い一覧を表示します。 + 主にデバッグ用です。</para></listitem> + </varlistentry> + + <varlistentry><term>dumpavail</term> +<!-- + <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is + suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem> +--> + <listitem><para><literal>dumpavail</literal> は、 + 標準出力に利用可能なものの一覧を出力します。 + &dpkg; と共に使用すると便利ですし、 + &dselect; でも使用されます。</para></listitem> + </varlistentry> + + <varlistentry><term>unmet</term> +<!-- + <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the + package cache.</para></listitem> + </varlistentry> +--> + <listitem><para><literal>unmet</literal> は、 + パッケージキャッシュ内にある、 + 不適当な依存関係の概要を表示します。</para></listitem> + </varlistentry> + + <varlistentry><term>show <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>show</literal> performs a function similar to + <command>dpkg -\-print-avail</command>; it displays the package records for the + named packages.</para></listitem> +--> + <listitem><para><literal>show</literal> は、 + <command>dpkg --print-avail</command> と同様の機能を実行します。 + これは、指定したパッケージのパッケージレコードの表示です。</para> + </listitem> + </varlistentry> + + <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term> +<!-- + <listitem><para><literal>search</literal> performs a full text search on all available package + lists for the regex pattern given. It searches the package names and the + descriptions for an occurrence of the regular expression and prints out + the package name and the short description. If <option>-\-full</option> is given + then output identical to <literal>show</literal> is produced for each matched + package, and if <option>-\-names-only</option> is given then the long description + is not searched, only the package name is.</para> +--> + <listitem><para><literal>search</literal> は、与えられた正規表現によって、 + すべての利用可能なパッケージに対して全文検索を行います。 + パッケージ名と説明に対して検索を行い、 + パッケージ名と短い説明文を表示します。 + <option>--full</option> が与えられた場合、マッチしたパッケージに対し + <literal>show</literal> と同じ情報を出力します。 + <option>--names-only</option> が与えられた場合は、 + 説明文に対して検索を行わず、パッケージ名に対してのみ対象とします。</para> + <para> +<!-- + Separate arguments can be used to specify multiple search patterns that + are and'ed together.</para></listitem> +--> + 空白で区切った引数で、 + 複数の検索パターンの and をとることができます。</para></listitem> + </varlistentry> + + <varlistentry><term>depends <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>depends</literal> shows a listing of each dependency a package has + and all the possible other packages that can fulfill that dependency.</para></listitem> +--> + <listitem><para><literal>depends</literal> は、 + パッケージが持っている依存関係と、 + その依存関係を満たす他のパッケージの一覧を表示します。</para></listitem> + </varlistentry> + + <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a + package has.</para></listitem> +--> + <listitem><para><literal>rdepends</literal> は、 + パッケージが持つ被依存関係を一覧表示します。</para></listitem> + </varlistentry> + + <varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term> +<!-- + <listitem><para>This command prints the name of each package in the system. The optional + argument is a prefix match to filter the name list. The output is suitable + for use in a shell tab complete function and the output is generated + extremely quickly. This command is best used with the + <option>-\-generate</option> option.</para></listitem> +--> + <listitem><para>このコマンドは、 + システムでの各パッケージの名称を表示します。 + オプションの引数により、取得する一覧より先頭一致で抽出することができます。 + この出力はシェルのタブによる補完機能に使いやすく、 + また非常に速く生成されます。 + このコマンドは <option>--generate</option> オプションと共に使用すると、 + 非常に便利です。</para></listitem> + </varlistentry> + + <varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term> +<!-- + <listitem><para><literal>dotty</literal> takes a list of packages on the command line and + generates output suitable for use by dotty from the + <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink> + package. The result will be a set of nodes and edges representing the + relationships between the packages. By default the given packages will + trace out all dependent packages; this can produce a very large graph. + To limit the output to only the packages listed on the command line, + set the <literal>APT::Cache::GivenOnly</literal> option.</para> +--> + <listitem><para><literal>dotty</literal> は、 + コマンドライン上のパッケージ名から、 + <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink> + パッケージの dotty コマンドで利用するのに便利な出力を生成します。 + 結果はパッケージの関係を表わす、ノード・エッジのセットで表現されます。 + デフォルトでは、すべての依存パッケージをトレースするので、 + 非常に大きい図が得られます。 + これは、<literal>APT::Cache::GivenOnly</literal> + オプションを設定して解除できます。</para> + +<!-- + <para>The resulting nodes will have several shapes; normal packages are boxes, + pure provides are triangles, mixed provides are diamonds, + missing packages are hexagons. Orange boxes mean recursion was stopped + [leaf packages], blue lines are pre-depends, green lines are conflicts.</para> +--> + <para>結果のノードは数種の形状をとります。 + 通常パッケージは四角、純粋仮想パッケージは三角、複合仮想パッケージは菱形、 + 六角形は欠落パッケージをそれぞれ表します。 + オレンジの四角は再帰が終了した「リーフパッケージ」、青い線は先行依存、 + 緑の線は競合を表します。</para> + +<!-- + <para>Caution, dotty cannot graph larger sets of packages.</para></listitem> +--> + <para>注意) dotty は、 + パッケージのより大きなセットのグラフは描けません。</para></listitem> + </varlistentry> + + <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term> +<!-- + <listitem><para><literal>policy</literal> is meant to help debug issues relating to the + preferences file. With no arguments it will print out the + priorities of each source. Otherwise it prints out detailed information + about the priority selection of the named package.</para></listitem> +--> + <listitem><para><literal>policy</literal> は、 + 設定ファイル関係の問題について、デバッグを支援します。 + 引数を指定しなかった場合、取得元ごとの優先順位を表示します。 + 一方、パッケージ名を指定した場合、 + 優先順の詳細情報を表示します。</para></listitem> + </varlistentry> + + <varlistentry><term>madison <replaceable>/[ pkg(s) ]</replaceable></term> +<!-- + <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic + the output format and a subset of the functionality of the Debian + archive management tool, <literal>madison</literal>. It displays + available versions of a package in a tabular format. Unlike the + original <literal>madison</literal>, it can only display information for + the architecture for which APT has retrieved package lists + (<literal>APT::Architecture</literal>).</para></listitem> +--> + <listitem><para><literal>apt-cache</literal> の <literal>madison</literal> + コマンドは、Debian アーカイブ管理ツール <literal>madison</literal> + の機能のサブセットで、出力フォーマットを真似ようとします。 + パッケージの利用可能バージョンを表形式で表示します。 + オリジナルの <literal>madison</literal> と違い、 + APT がパッケージ一覧を検索したアーキテクチャ + (<literal>APT::Architecture</literal>) + の情報を表示するだけです。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>-p</option></term><term><option>--pkg-cache</option></term> +<!-- + <listitem><para>Select the file to store the package cache. The package cache is the + primary cache used by all operations. + Configuration Item: <literal>Dir::Cache::pkgcache</literal>.</para></listitem> +--> + <listitem><para>パッケージキャッシュを格納するファイルを選択します。 + パッケージキャッシュは、すべての操作で使用される一次キャッシュです。 + 設定項目 - <literal>Dir::Cache::pkgcache</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-s</option></term><term><option>--src-cache</option></term> +<!-- + <listitem><para>Select the file to store the source cache. The source is used only by + <literal>gencaches</literal> and it stores a parsed version of the package + information from remote sources. When building the package cache the + source cache is used to advoid reparsing all of the package files. + Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem> +--> + <listitem><para>ソースキャッシュを格納するファイルを選択します。 + このソースキャッシュは <literal>gencaches</literal> でのみ使用され、 + ここに解析された取得元のパッケージ情報が格納されています。 + パッケージキャッシュを構築する際に、ソースキャッシュは、 + 全パッケージファイルを再解析を避ける上で便利です。 + <!--advoid は avoid のミススペル？ --> + 設定項目 - <literal>Dir::Cache::srcpkgcache</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term> +<!-- + <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators. + More q's will produce more quietness up to a maximum of 2. You can also use + <option>-q=#</option> to set the quietness level, overriding the configuration file. + Configuration Item: <literal>quiet</literal>.</para></listitem> +--> + <listitem><para>静粛 - 進捗表示を省略し、 + ログをとるのに便利な出力を行います。 + 最大 2 つまで q を重ねることでさらに静粛にできます。 + また、<option>-q=#</option> のように静粛レベルを指定して、 + 設定ファイルを上書きすることもできます。 + 設定項目 - <literal>quiet</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-i</option></term><term><option>--important</option></term> +<!-- + <listitem><para>Print only important dependencies; for use with unmet. Causes only Depends and + Pre-Depends relations to be printed. + Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem> +--> + <listitem><para>「重要」依存関係のみ表示 - unmet と共に使用します。 + これは「依存」関係と「先行依存」関係のみを表示するためです。 + 設定項目 - <literal>APT::Cache::Important</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-f</option></term><term><option>--full</option></term> +<!-- + <listitem><para>Print full package records when searching. + Configuration Item: <literal>APT::Cache::ShowFull</literal>.</para></listitem> +--> + <listitem><para>search 時に全パッケージレコードを表示します。 + 設定項目 - <literal>APT::Cache::ShowFull</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-a</option></term><term><option>--all-versions</option></term> +<!-- + <listitem><para>Print full records for all available versions. This is the + default; to turn it off, use <option>-\-no-all-versions</option>. + If <option>-\-no-all-versions</option> is specified, only the candidate version + will displayed (the one which would be selected for installation). + This option is only applicable to the <literal>show</literal> command. + Configuration Item: <literal>APT::Cache::AllVersions</literal>.</para></listitem> +--> + <listitem><para>全利用可能バージョンのレコード全体を表示します。 + これはデフォルトの動作で、 + 無効にするには <option>--no-all-versions</option> を使用してください。 + <option>--no-all-versions</option> を指定すると、 + 候補バージョン (インストールの際に選択されるもの) だけ表示します。 + このオプションは、show コマンドでのみ適用できます。 + 設定項目 - <literal>APT::Cache::AllVersions</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-g</option></term><term><option>--generate</option></term> +<!-- + <listitem><para>Perform automatic package cache regeneration, rather than use the cache + as it is. This is the default; to turn it off, use <option>-\-no-generate</option>. + Configuration Item: <literal>APT::Cache::Generate</literal>.</para></listitem> +--> + <listitem><para>そのままキャッシュを使用するのではなく、 + 自動的にパッケージキャッシュを再生成します。これはデフォルトの動作で、 + 無効にするには <option>--no-generate</option> を使用してください。 + 設定項目 - <literal>APT::Cache::Generate</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--names-only</option></term><term><option>-n</option></term> +<!-- + <listitem><para>Only search on the package names, not the long descriptions. + Configuration Item: <literal>APT::Cache::NamesOnly</literal>.</para></listitem> +--> + <listitem><para>説明文ではなく、パッケージ名からのみ検索します。 + 設定項目 - <literal>APT::Cache::NamesOnly</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--all-names</option></term> +<!-- + <listitem><para>Make <literal>pkgnames</literal> print all names, including virtual packages + and missing dependencies. + Configuration Item: <literal>APT::Cache::AllNames</literal>.</para></listitem> +--> + <listitem><para><literal>pkgnames</literal> で、 + 仮想パッケージや欠落依存関係を含めた全名称を表示します。 + 設定項目 - <literal>APT::Cache::AllNames</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--recurse</option></term> +<!-- + <listitem><para>Make <literal>depends</literal> and <literal>rdepends</literal> recursive so + that all packages mentioned are printed once. + Configuration Item: <literal>APT::Cache::RecurseDepends</literal>.</para></listitem> +--> + <listitem><para><literal>depends</literal> や <literal>rdepends</literal> + で、指定した全パッケージを再帰的に一度に表示します。 + 設定項目 - <literal>APT::Cache::RecurseDepends</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--installed</option></term> +<!-- + <listitem><para> + Limit the output of <literal>depends</literal> and <literal>rdepends</literal> to + packages which are currently installed. + Configuration Item: <literal>APT::Cache::Installed</literal>.</para></listitem> +--> + <listitem><para> + <literal>depends</literal> や <literal>rdepends</literal> の出力を、 + 現在インストールされているパッケージに限定します。 + 設定項目 - <literal>APT::Cache::Installed</literal></para></listitem> + </varlistentry> + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>Files</title> +--> + <refsect1><title>ファイル</title> + <variablelist> + <varlistentry><term><filename>/etc/apt/sources.list</filename></term> +<!-- + <listitem><para>Locations to fetch packages from. + Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem> +--> + <listitem><para>パッケージの取得元。 + 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>&statedir;/lists/</filename></term> +<!-- + <listitem><para>Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem> +--> + <listitem><para>&sources-list; に指定した、 + パッケージリソースごとの状態情報格納エリア。 + 設定項目 - <literal>Dir::State::Lists</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> +<!-- + <listitem><para>Storage area for state information in transit. + Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> +--> + <listitem><para>取得中状態情報格納エリア。 + 設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf;, &sources-list;, &apt-get; + </para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> +<!-- + <para><command>apt-cache</command> returns zero on normal operation, decimal 100 on error. + </para> +--> + <para><command>apt-cache</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。 + </para> + </refsect1> + + &manbugs; + &translator; +</refentry> diff --git a/doc/ja/apt-cdrom.ja.8.sgml b/doc/ja/apt-cdrom.ja.8.sgml deleted file mode 100644 index 4328ef8c2..000000000 --- a/doc/ja/apt-cdrom.ja.8.sgml +++ /dev/null @@ -1,230 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!-- translation of version 1.3 --> -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ - -<!ENTITY % aptent SYSTEM "apt.ent.ja"> -%aptent; - -]> - -<refentry lang=ja> - &apt-docinfo; - - <refmeta> - <refentrytitle>apt-cdrom</> - <manvolnum>8</> - </refmeta> - - <!-- Man page title --> - <refnamediv> - <refname>apt-cdrom</> -<!-- - <refpurpose>APT CDROM managment utility</> ---> - <refpurpose>APT CDROM 桼ƥƥ</> - </refnamediv> - - <!-- Arguments --> - <refsynopsisdiv> - <cmdsynopsis> - <command>apt-cdrom</> - <arg><option>-hvrmfan</></arg> - <arg><option>-d=<replaceable/cdrom mount point/</></arg> - <arg><option>-o=<replaceable/config string/</></arg> - <arg><option>-c=<replaceable/file/</></arg> - <group choice=req> - <arg>add</> - <arg>ident</> - </group> - </cmdsynopsis> - </refsynopsisdiv> - -<!-- - <RefSect1><Title>Description</> ---> - <RefSect1><Title></> - <para> -<!-- - <command/apt-cdrom/ is used to add a new CDROM to APTs list of available - sources. <command/apt-cdrom/ takes care of determining the structure of - the disc as well as correcting for several possible mis-burns and - verifying the index files. ---> - <command/apt-cdrom/ ѲǽʼȤơAPT ΥꥹȤ˿ CDROM - ɲäΤǤ<command/apt-cdrom/ ϾƤ»ǽʸ¤ - ǥ¤γǧޤޤǥåեγǧԤޤ - <para> -<!-- - It is necessary to use <command/apt-cdrom/ to add CDs to the APT system, - it cannot be done by hand. Furthermore each disk in a multi-cd set must be - inserted and scanned separately to account for possible mis-burns. ---> - APT ƥ CD ɲäΤϼȤǤᡢ<command/apt-cdrom/ - ɬפǤξ塢CD åȤΥǥ 1 ŤġƤ»Ǥ뤫 - ɾʤФʤޤ - <para> -<!-- - Unless the <option/-h/, or <option/- -help/ option is given one of the - commands below must be present. ---> - <option/-h/ <option/--help/ ʲ˵륳ޥɤɬפǤ - <VariableList> - <VarListEntry><Term>add</Term> - <ListItem><Para> -<!-- - <literal/add/ is used to add a new disc to the source list. It will unmount the - CDROM device, prompt for a disk to be inserted and then procceed to - scan it and copy the index files. If the disc does not have a proper - <filename>.disk/</> directory you will be prompted for a descriptive - title. ---> - <literal/add/ ϡǥꥹȤɲäޤ - CDROM ǥХΥޥȡǥΥץץȤɽθˡ - ǥΥȥǥåեΥԡԤޤ - ǥ <filename>.disk/</> ǥ쥯ȥ꤬¸ߤʤ硢 - ȥϤ褦¥ޤ - <para> -<!-- - APT uses a CDROM ID to track which disc is currently in the drive and - maintains a database of these IDs in - <filename>&statedir;/cdroms.list</> ---> - APT ϡߥɥ饤֤ˤǥΥȥåCDROM ID - Ѥޤޤ ID <filename>&statedir;/cdroms.list</> - ǡ١Ǵޤ - </VarListEntry> - - <VarListEntry><Term>ident</Term> - <ListItem><Para> -<!-- - A debugging tool to report the identity of the current disc as well - as the stored file name ---> - ǼƤե̾ȡߤΥǥƱ줫ɤݡȤ롢 - ǥХåġǤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>Options</> ---> - <RefSect1><Title>ץ</> - - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-d/</><term><option/--cdrom/</> - <ListItem><Para> -<!-- - Mount point; specify the location to mount the cdrom. This mount - point must be listed in <filename>/etc/fstab</> and propely configured. - Configuration Item: <literal/Acquire::cdrom::mount/. ---> - ޥȥݥ - cdrom ޥȤꤷޤ - ΥޥȥݥȤϡ<filename>/etc/fstab</> ꤵƤ - ɬפޤ - - <literal/Acquire::cdrom::mount/ - </VarListEntry> - - <VarListEntry><term><option/-r/</><term><option/--rename/</> - <ListItem><Para> -<!-- - Rename a disc; change the label of a disk or override the disks - given label. This option will cause <command/apt-cdrom/ to prompt for - a new label. - Configuration Item: <literal/APT::CDROM::Rename/. ---> - ǥ̾ѹ - ꤷ̾ǥǥΥ٥ѹޤ - Υץˤꡢ<command/apt-cdrom/ ٥Ϥ褦 - ¥ޤ - - <literal/APT::CDROM::Rename/ - </VarListEntry> - - <VarListEntry><term><option/-m/</><term><option/--no-mount/</> - <ListItem><Para> -<!-- - No mounting; prevent <command/apt-cdrom/ from mounting and unmounting - the mount point. - Configuration Item: <literal/APT::CDROM::NoMount/. ---> - ޥȤʤ - <command/apt-cdrom/ ޥȥݥȤ - ޥȡޥȤΤɤޤ - - <literal/APT::CDROM::NoMount/ - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--fast/</> - <ListItem><Para> -<!-- - Fast Copy; Assume the package files are valid and do not check - every package. This option should be used only if - <command/apt-cdrom/ has been run on this disc before and did not detect - any errors. - Configuration Item: <literal/APT::CDROM::Fast/. ---> - ®ԡ - ѥåե뤬ǤȲꤷ - åԤޤ - ΥץϡΥǥǰ <command/apt-cdrom/ ԤäƤꡢ - 顼ФʤäΤѤ٤Ǥ - - <literal/APT::CDROM::Fast/ - </VarListEntry> - - <VarListEntry><term><option/-a/</><term><option/--thorough/</> - <ListItem><Para> -<!-- - Thorough Package Scan; This option may be needed with some old - Debian 1.1/1.2 discs that have Package files in strange places. It - takes much longer to scan the CD but will pick them all up. ---> - ѥå - Ť Debian 1.1/1.2 Υǥϡ - ѥåե뤬㤦ˤ뤿ᡢΥץȤɬפ - 뤫⤷ޤ - CD Τ˻֤ޤѥåե - Ф뤳ȤǤޤ - </VarListEntry> - - <VarListEntry><term><option/-n/</> - <term><option/--just-print/</> - <term><option/--recon/</> - <term><option/--no-act/</> - <ListItem><Para> -<!-- - No Changes; Do not change the &sources-list; file and do not - write index files. Everything is still checked however. - Configuration Item: <literal/APT::CDROM::NoAct/. ---> - ѹʤ - &sources-list; եѹ䡢ǥåե - ߤԤޤȤϤ٤ƤΥåϹԤޤ - - <literal/APT::CDROM::NoAct/ - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>See Also</> ---> - <RefSect1><Title>Ϣ</> - <para> - &apt-conf;, &apt-get;, &sources-list; - </RefSect1> - -<!-- - <RefSect1><Title>Diagnostics</> ---> - <RefSect1><Title>ǥå</> - <para> -<!-- - <command/apt-cdrom/ returns zero on normal operation, decimal 100 on error. ---> - <command/apt-get/ ｪλ 0 ֤ޤ - 顼ˤϽʤ 100 ֤ޤ - </RefSect1> - - &manbugs; - &manauthor; - &translator; -</refentry> - diff --git a/doc/ja/apt-cdrom.ja.8.xml b/doc/ja/apt-cdrom.ja.8.xml new file mode 100644 index 000000000..bf84b4749 --- /dev/null +++ b/doc/ja/apt-cdrom.ja.8.xml @@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <date>14 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-cdrom</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-cdrom</refname> +<!-- + <refpurpose>APT CDROM management utility</refpurpose> +--> + <refpurpose>APT CDROM 管理ユーティリティ</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-cdrom</command> + <arg><option>-hvrmfan</option></arg> + <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <group> + <arg>add</arg> + <arg>ident</arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list + of available sources. <command>apt-cdrom</command> takes care of + determining the structure of + the disc as well as correcting for several possible mis-burns and + verifying the index files. + </para> +--> + <para><command>apt-cdrom</command> は利用可能な取得元として、 + APT のリストに新しい CDROM を追加するのに便利です。 + <command>apt-cdrom</command> は焼き損じを可能な限り補正し、 + ディスク構造の確認を助けます。また、インデックスファイルの確認を行います。 + </para> + +<!-- + <para>It is necessary to use <command>apt-cdrom</command> to add CDs to the + APT system, + it cannot be done by hand. Furthermore each disk in a multi-cd set must be + inserted and scanned separately to account for possible mis-burns. + </para> +--> + <para>APT システムに手作業で CD を追加するのは難しいため、 + <command>apt-cdrom</command> が必要になります。 + その上、CD セットのディスクを 1 枚づつ、 + 焼き損じを補正できるか評価しなければなりません。 + </para> + +<!-- + <para>Unless the <option>-h</option>, or <option>-\-help</option> option is + given one of the commands below must be present. +--> + <para><option>-h</option> オプションや <option>--help</option> オプションを除き、 + 以下に挙げるコマンドが必要です。 + + <variablelist> + <varlistentry><term>add</term> +<!-- + <listitem><para><literal>add</literal> is used to add a new disc to the + source list. It will unmount the + CDROM device, prompt for a disk to be inserted and then procceed to + scan it and copy the index files. If the disc does not have a proper + <filename>disk</filename> directory you will be prompted for a descriptive + title. +--> + <listitem><para><literal>add</literal> は、 + 新しいディスクを取得元リストに追加します。 + CDROM デバイスのアンマウント、ディスク挿入のプロンプトの表示の後に、 + ディスクのスキャンとインデックスファイルのコピーを行います。 + ディスクに正しい <filename>disk</filename> ディレクトリが存在しない場合、 + タイトルを入力するよう促します。 + </para> + +<!-- + <para>APT uses a CDROM ID to track which disc is currently in the drive and + maintains a database of these IDs in + <filename>&statedir;/cdroms.list</filename> +--> + <para>APT は、現在ドライブにあるディスクのトラックから取得した、 + CDROM ID を使用します。またその ID を、 + <filename>&statedir;/cdroms.list</filename> 内のデータベースで管理します。 + </para> + </listitem> + </varlistentry> + + <varlistentry><term>ident</term> +<!-- + <listitem><para>A debugging tool to report the identity of the current + disc as well as the stored file name +--> + <listitem><para>格納されているファイル名と、 + 現在のディスクが同一かどうかをレポートする、デバッグツールです。 + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + + <refsect1><title>Options</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term> +<!-- + <listitem><para>Mount point; specify the location to mount the cdrom. This + mount point must be listed in <filename>/etc/fstab</filename> and + properly configured. + Configuration Item: <literal>Acquire::cdrom::mount</literal>. +--> + <listitem><para>マウントポイント - cdrom をマウントする場所を指定します。 + このマウントポイントは、 + <filename>/etc/fstab</filename> に正しく設定されている必要があります。 + 設定項目 - <literal>Acquire::cdrom::mount</literal> + </para> + </listitem> + </varlistentry> + + <varlistentry><term><option>-r</option></term><term><option>--rename</option></term> +<!-- + <listitem><para>Rename a disc; change the label of a disk or override the + disks given label. This option will cause <command>apt-cdrom</command> to + prompt for a new label. + Configuration Item: <literal>APT::CDROM::Rename</literal>. +--> + <listitem><para>ディスクの名前変更 - + 指定した名前でディスクのラベルを変更・更新します。このオプションにより、 + <command>apt-cdrom</command> が新しいラベルを入力するよう促します。 + 設定項目 - <literal>APT::CDROM::Rename</literal> + </para> + </listitem> + </varlistentry> + + <varlistentry><term><option>-m</option></term><term><option>--no-mount</option></term> +<!-- + <listitem><para>No mounting; prevent <command>apt-cdrom</command> from + mounting and unmounting the mount point. + Configuration Item: <literal>APT::CDROM::NoMount</literal>. +--> + <listitem><para>マウントなし - <command>apt-cdrom</command> が、 + マウントポイントにマウント・アンマウントしないようにします。 + 設定項目 - <literal>APT::CDROM::NoMount</literal> + </para> + </listitem> + </varlistentry> + + <varlistentry><term><option>-f</option></term><term><option>--fast</option></term> +<!-- + <listitem><para>Fast Copy; Assume the package files are valid and do not + check every package. This option should be used only if + <command>apt-cdrom</command> has been run on this disc before and did not + detect any errors. + Configuration Item: <literal>APT::CDROM::Fast</literal>. +--> + <listitem><para>高速コピー - パッケージファイルが妥当であると仮定し、 + チェックを全く行いません。このオプションは、 + このディスクで以前 <command>apt-cdrom</command> を行っており、 + エラーを検出しなかった場合のみ使用すべきです。 + 設定項目 - <literal>APT::CDROM::Fast</literal> + </para> + </listitem> + </varlistentry> + + <varlistentry><term><option>-a</option></term><term><option>--thorough</option></term> +<!-- + <listitem><para>Thorough Package Scan; This option may be needed with some + old Debian 1.1/1.2 discs that have Package files in strange places. It + takes much longer to scan the CD but will pick them all up. +--> + <listitem><para>完全パッケージスキャン - + 古い Debian 1.1/1.2 のディスクは、パッケージファイルが違う場所にあるため、 + このオプションを使う必要があるかもしれません。 + CD をスキャンするのに非常に時間がかかりますが、 + 全パッケージファイルを抽出することができます。 + </para> + </listitem> + </varlistentry> + + <varlistentry><term><option>-n</option></term> + <term><option>--just-print</option></term> + <term><option>--recon</option></term> + <term><option>--no-act</option></term> +<!-- + <listitem><para>No Changes; Do not change the &sources-list; file and do + not write index files. Everything is still checked however. + Configuration Item: <literal>APT::CDROM::NoAct</literal>. +--> + <listitem><para>変更なし - &sources-list; ファイルの変更や、 + インデックスファイルの書き込みを行いません。 + とはいえ、すべてのチェックは行います。 + 設定項目 - <literal>APT::CDROM::NoAct</literal> + </para> + </listitem> + </varlistentry> + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf;, &apt-get;, &sources-list; + </para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> +<!-- + <para><command>apt-cdrom</command> returns zero on normal operation, decimal 100 on error. +--> + <para><command>apt-cdrom</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。 + </para> + </refsect1> + + &manbugs; + &translator; +</refentry> + diff --git a/doc/ja/apt-config.ja.8.xml b/doc/ja/apt-config.ja.8.xml new file mode 100644 index 000000000..b1d90f5b5 --- /dev/null +++ b/doc/ja/apt-config.ja.8.xml @@ -0,0 +1,165 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-config</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-config</refname> +<!-- + <refpurpose>APT Configuration Query program</refpurpose> +--> + <refpurpose>APT 設定取得プログラム</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-config</command> + <arg><option>-hv</option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <group choice="req"> + <arg>shell</arg> + <arg>dump</arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-config</command> is an internal program used by various + portions of the APT suite to provide consistent configurability. It accesses + the main configuration file <filename>/etc/apt/apt.conf</filename> in a + manner that is easy to use by scripted applications.</para> +--> + <para><command>apt-config</command> は、 + APT スイートの様々な所で一貫した設定を行うために使用する、内部ツールです。 + スクリプトアプリケーションで使いやすい方法で、 + メイン設定ファイル <filename>/etc/apt/apt.conf</filename> + にアクセスします。</para> + +<!-- + <para>Unless the <option>-h</option>, or <option>-\-help</option> option is + given one of the commands below must be present. + </para> +--> + <para><option>-h</option> や <option>--help</option> オプションを除き、 + 以下に挙げるコマンドが必要です。</para> + + <variablelist> + <varlistentry><term>shell</term> + <listitem><para> +<!-- + shell is used to access the configuration information from a shell + script. It is given pairs of arguments, the first being a shell + variable and the second the configuration value to query. As output + it lists a series of shell assignments commands for each present value. + In a shell script it should be used like: +--> + shell は、シェルスクリプトから設定情報にアクセスするのに使用します。 + 引数として、まずシェル変数、次に取得したい設定値をペアで与えます。 + 出力として、現在の値ごとにシェル代入コマンドの一覧を表示します。 + シェルスクリプト内では、以下のようにしてください。 + </para> + +<informalexample><programlisting> +OPTS="-f" +RES=`apt-config shell OPTS MyApp::options` +eval $RES +</programlisting></informalexample> + +<!-- + <para>This will set the shell environment variable $OPTS to the value of + MyApp::options with a default of <option>-f</option>.</para> +--> + <para>これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。 + デフォルト値は <option>-f</option> となります。</para> + + <!-- + <para>The configuration item may be postfixed with a /[fdbi]. f returns + file names, d returns directories, b returns true or false and i returns + an integer. Each of the returns is normalized and verified + internally.</para> +--> + <para>設定項目は /[fdbi] を後ろに付けられます。 + f はファイル名を、d はディレクトリを、b は true か false を、 + i は整数を返します。 + 返り値ごとに内部で正規化と検証を行います。</para> + + </listitem> + </varlistentry> + + <varlistentry><term>dump</term> + <listitem><para> +<!-- + Just show the contents of the configuration space.</para> +--> + 設定箇所の内容を表示するだけです。</para> + </listitem> + </varlistentry> + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf; + </para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> +<!-- + <para><command>apt-config</command> returns zero on normal operation, decimal 100 on error. +--> + <para><command>apt-config</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。 + </para> + </refsect1> + + &manbugs; + &translator; + +</refentry> + diff --git a/doc/ja/apt-extracttemplates.ja.1.xml b/doc/ja/apt-extracttemplates.ja.1.xml new file mode 100644 index 000000000..079c89402 --- /dev/null +++ b/doc/ja/apt-extracttemplates.ja.1.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-extracttemplates</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-extracttemplates</refname> +<!-- + <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose> +--> + <refpurpose>Debian パッケージから DebConf 設定とテンプレートを抽出するユーティリティ</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-extracttemplates</command> + <arg><option>-hv</option></arg> + <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg> + <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-extracttemplates</command> will take one or more Debian package files + as input and write out (to a temporary directory) all associated config + scripts and template files. For each passed in package that contains + config scripts and templates, one line of output will be generated + in the format:</para> +--> + <para><command>apt-extracttemplates</command> は、 + 入力に複数の Debian パッケージをとり、 + 関連する設定スクリプトとテンプレートファイルを + (一時ディレクトリに) 出力します。 + 設定スクリプト・テンプレートファイルを持つ、 + 渡されたパッケージそれぞれに対し、以下の形式で 1 行ずつ出力します。</para> + <para>package version template-file config-script</para> +<!-- + <para>template-file and config-script are written to the temporary directory + specified by the -t or -\-tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) + directory, with filenames of the form <filename>package.template.XXXX</filename> and + <filename>package.config.XXXX</filename></para> +--> + <para>テンプレートファイルや、設定スクリプトは、 + -t や --tempdir で指定した一時ディレクトリ + (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、 + ファイル名は、<filename>package.template.XXXX</filename> や + <filename>package.config.XXXX</filename> と言った形になります。</para> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term> +<!-- + <listitem><para> + Temporary directory in which to write extracted debconf template files + and config scripts + Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem> +--> + <listitem><para> + 抽出した debconf テンプレートファイルや設定スクリプトを書き出す、 + 一時ディレクトリ。 + 設定項目 - <literal>APT::ExtractTemplates::TempDir</literal></para></listitem> + </varlistentry> + + &apt-commonoptions; + + </variablelist> + + + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf;</para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> + <para><command>apt-extracttemplates</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。</para> + </refsect1> + + &manbugs; + &translator; + +</refentry> diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml new file mode 100644 index 000000000..be6bbd767 --- /dev/null +++ b/doc/ja/apt-ftparchive.ja.1.xml @@ -0,0 +1,1020 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-ftparchive</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-ftparchive</refname> +<!-- + <refpurpose>Utility to generate index files</refpurpose> +--> + <refpurpose>インデックスファイル生成ユーティリティ</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-ftparchive</command> + <arg><option>-hvdsq</option></arg> + <arg><option>--md5</option></arg> + <arg><option>--delink</option></arg> + <arg><option>--readonly</option></arg> + <arg><option>--contents</option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <group choice="req"> + <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> + <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> + <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg> + <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg> + <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg> + <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-ftparchive</command> is the command line tool that generates the index + files that APT uses to access a distribution source. The index files should + be generated on the origin site based on the content of that site.</para> +--> + <para><command>apt-ftparchive</command> は、 + APT が取得元にアクセスするのに必要な、 + インデックスファイルを生成するコマンドラインツールです。 + インデックスファイルは、元のサイトの内容に基づき生成されるべきです。</para> + +<!-- + <para><command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; program, + incorporating its entire functionality via the <literal>packages</literal> command. + It also contains a contents file generator, <literal>contents</literal>, and an + elaborate means to 'script' the generation process for a complete + archive.</para> +--> + <para><command>apt-ftparchive</command> は、 + &dpkg-scanpackages; プログラムのスーパーセットで、 + <literal>packages</literal> コマンド経由で機能全体を取り込んでいます。 + また、contents ファイルジェネレータ <literal>contents</literal> と + 完全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。</para> + +<!-- + <para>Internally <command>apt-ftparchive</command> can make use of binary databases to + cache the contents of a .deb file and it does not rely on any external + programs aside from &gzip;. When doing a full generate it automatically + performs file-change checks and builds the desired compressed output files.</para> +--> + <para>本質的に <command>apt-ftparchive</command> は、 + .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。 + また、&gzip; 以外のいかなる外部プログラムにも依存しません。 + すべて生成する際には、 + ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。</para> + +<!-- + <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the + commands below must be present.</para> +--> + <para><option>-h</option> オプションや <option>--help</option> オプションを除き、 + 以下に挙げるコマンドが必要です。</para> + + <variablelist> + <varlistentry><term>packages</term> + <listitem><para> +<!-- + The packages command generates a package file from a directory tree. It + takes the given directory and recursively searches it for .deb files, + emitting a package record to stdout for each. This command is + approximately equivalent to &dpkg-scanpackages;.</para> +--> + packages コマンドは、 + ディレクトリツリーからパッケージファイルを生成します。 + 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。 + またパッケージレコードを標準出力にそれぞれ出力します。 + このコマンドは、&dpkg-scanpackages; とほぼ同じです。</para> + +<!-- + <para>The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem> +--> + <para><option>--db</option> オプションで、 + キャッシュ DB を指定できます。</para></listitem> + </varlistentry> + + <varlistentry><term>sources</term> + <listitem><para> +<!-- + The <literal>sources</literal> command generates a source index file from a directory tree. + It takes the given directory and recursively searches it for .dsc files, + emitting a source record to stdout for each. This command is approximately + equivalent to &dpkg-scansources;.</para> +--> + <literal>sources</literal> コマンドは、 + ディレクトリツリーからソースインデックスファイルを生成します。 + 与えられたディレクトリから再帰検索し、.dsc ファイルを取得します。 + またソースレコードを標準出力にそれぞれ出力します。 + このコマンドは、&dpkg-scansources; とほぼ同じです。</para> + <para> +<!-- + If an override file is specified then a source override file will be + looked for with an extension of .src. The -\-source-override option can be + used to change the source override file that will be used.</para></listitem> +--> + override ファイルを指定した場合、 + src 拡張子がついたソースオーバーライドファイルを探します。 + 使用するソースオーバーライドファイルを変更するのには、 + --source-override オプションを使用します。</para></listitem> + </varlistentry> + + <varlistentry><term>contents</term> + <listitem><para> +<!-- + The <literal>contents</literal> command generates a contents file from a directory tree. It + takes the given directory and recursively searches it for .deb files, + and reads the file list from each file. It then sorts and writes to stdout + the list of files matched to packages. Directories are not written to + the output. If multiple packages own the same file then each package is + separated by a comma in the output.</para> +--> + <literal>contents</literal> コマンドは、 + ディレクトリツリーからコンテンツファイルを生成します。 + 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。 + またファイルごとにファイル一覧を読み取ります。 + その後、パッケージに対応するファイル一覧を標準出力にソートして出力します。 + ディレクトリは出力に含まれません。 + 複数のパッケージが同じファイルを持つ場合、 + パッケージ名をカンマ区切りで出力します。</para> + <para> +<!-- + The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem> +--> + <option>--db</option> オプションで、 + キャッシュ DB を指定できます。</para></listitem> + </varlistentry> + + <varlistentry><term>release</term> + <listitem><para> +<!-- + The <literal>release</literal> command generates a Release file from a + directory tree. It recursively searches the given directory for + Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, + Sources.bz2, Release and md5sum.txt files. It then writes to + stdout a Release file containing an MD5 digest and SHA1 digest + for each file.</para> +--> + <literal>release</literal> コマンドは、 + ディレクトリツリーから Release ファイルを生成します。 + 与えられたディレクトリから、Packages, Packages.gz, Packages.bz2, Sources, + Sources.gz, Sources.bz2, Release, md5sum.txt + といったファイルを再帰検索します。 + その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを含んだ + Release ファイルを、標準出力に書き出します。</para> + <para> +<!-- + Values for the additional metadata fields in the Release file are + taken from the corresponding variables under + <literal>APT::FTPArchive::Release</literal>, + e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported fields + are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>, + <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>, + <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>.</para></listitem> +--> + Release ファイルの追加メタデータフィールドの値は、 + <literal>APT::FTPArchive::Release</literal> 以下の相当する値 + (例: <literal>APT::FTPArchive::Release::Origin</literal>) をとります。 + サポートするフィールドは、 + <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>, + <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>, + <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal> です。</para></listitem> + + </varlistentry> + + <varlistentry><term>generate</term> + <listitem><para> +<!-- + The <literal>generate</literal> command is designed to be runnable from a cron script and + builds indexes according to the given config file. The config language + provides a flexible means of specifying which index files are built from + which directories, as well as providing a simple means of maintaining the + required settings.</para></listitem> +--> + <literal>generate</literal> コマンドは、 + cron スクリプトから実行できるよう設計されており、 + 与えられた設定ファイルに従ってインデックスを生成します。 + 設定言語は、必要な設定を維持する簡単な方法を提供すると共に、 + インデックスファイルをどのディレクトリから作成するかを指定する、 + 柔軟な方法を提供します。</para></listitem> + </varlistentry> + + <varlistentry><term>clean</term> + <listitem><para> +<!-- + The <literal>clean</literal> command tidies the databases used by the given + configuration file by removing any records that are no longer necessary.</para></listitem> +--> + <literal>clean</literal> コマンドは、 + 設定ファイルで与えられたデータベースを、 + もう必要ないレコードを削除して整理します。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>The Generate Configuration</title> +--> + <refsect1><title>generate 設定</title> + <para> +<!-- + The <literal>generate</literal> command uses a configuration file to describe the + archives that are going to be generated. It follows the typical ISC + configuration format as seen in ISC tools like bind 8 and dhcpd. + &apt-conf; contains a description of the syntax. Note that the generate + configuration is parsed in sectional manner, but &apt-conf; is parsed in a + tree manner. This only effects how the scope tag is handled.</para> +--> + <literal>generate</literal> コマンドは、 + 生成するアーカイブに関する記述をした設定ファイルを使用します。 + 設定ファイルは、bind 8 や dhcpd といった ISC ツールに見られるような、 + ISC 設定フォーマットに従います。 + &apt-conf; に、文法の説明があります。 + generate 設定はセクション法で解析しますが、 + &apt-conf; はツリー法で解析するのに注意してください。 + これはスコープタグの扱い方に違いがあるだけです。</para> + + <para> +<!-- + The generate configuration has 4 separate sections, each described below.</para> +--> + generate 設定には 4 個の独立したセクションがあります。 + 以下それぞれ説明します。</para> + +<!-- + <refsect2><title>Dir Section</title> +--> + <refsect2><title>Dir セクション</title> + <para> +<!-- + The <literal>Dir</literal> section defines the standard directories needed to + locate the files required during the generation process. These + directories are prepended to certain relative paths defined in later + sections to produce a complete an absolute path.</para> +--> + <literal>Dir</literal> セクションは、 + 生成プロセスで必要なファイルを配置するための、 + 標準ディレクトリを定義します。 + このディレクトリは、完全な絶対パスを生成するため、 + 後のセクションで定義される相対パスの前に結合します。</para> + <variablelist> + <varlistentry><term>ArchiveDir</term> + <listitem><para> +<!-- + Specifies the root of the FTP archive, in a standard + Debian configuration this is the directory that contains the + <filename>ls-LR</filename> and dist nodes.</para></listitem> +--> + FTP アーカイブのルートを指定します。 + 標準的な Debian 設定では、このディレクトリには + <filename>ls-LR</filename> と dist ノードがあります。</para></listitem> + </varlistentry> + + <varlistentry><term>OverrideDir</term> + <listitem><para> +<!-- + Specifies the location of the override files.</para></listitem> +--> + オーバーライドファイルの場所を指定します。</para></listitem> + </varlistentry> + + <varlistentry><term>CacheDir</term> + <listitem><para> +<!-- + Specifies the location of the cache files</para></listitem> +--> + キャッシュファイルの場所を指定します。</para></listitem> + </varlistentry> + + <varlistentry><term>FileListDir</term> + <listitem><para> +<!-- + Specifies the location of the file list files, + if the <literal>FileList</literal> setting is used below.</para></listitem> +--> + <literal>FileList</literal> 設定が以下で使用されている場合、 + ファイルリストファイルの場所を指定します。</para></listitem> + </varlistentry> + </variablelist> + </refsect2> + +<!-- + <refsect2><title>Default Section</title> +--> + <refsect2><title>Default セクション</title> + <para> +<!-- + The <literal>Default</literal> section specifies default values, and settings + that control the operation of the generator. Other sections may override + these defaults with a per-section setting.</para> +--> + <literal>Default</literal> セクションではデフォルト値を指定します。 + また、生成器の動作を制御する設定も行います。 + 他のセクションでは、ここにあるデフォルト値を、 + セクションごとの設定で上書きします。</para> + <variablelist> + <varlistentry><term>Packages::Compress</term> + <listitem><para> +<!-- + Sets the default compression schemes to use + for the Package index files. It is a string that contains a space + separated list of at least one of: '.' (no compression), 'gzip' and + 'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem> +--> + Package インデックスファイルのデフォルトの圧縮方法を設定します。 + 少なくともひとつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、 + 空白区切りの文字列です。 + 圧縮方法のデフォルトはすべて '. gzip' です。</para></listitem> + </varlistentry> + + <varlistentry><term>Packages::Extensions</term> + <listitem><para> +<!-- + Sets the default list of file extensions that are package files. + This defaults to '.deb'.</para></listitem> +--> + パッケージファイル拡張子のデフォルト値を列挙します。 + このデフォルト値は '.deb' です。</para></listitem> + </varlistentry> + + <varlistentry><term>Sources::Compress</term> + <listitem><para> +<!-- + This is similar to <literal>Packages::Compress</literal> + except that it controls the compression for the Sources files.</para></listitem> +--> + <literal>Packages::Compress</literal> と同様に、 + Sources ファイルの圧縮方法を指定します。</para></listitem> + </varlistentry> + + <varlistentry><term>Sources::Extensions</term> + <listitem><para> +<!-- + Sets the default list of file extensions that are source files. + This defaults to '.dsc'.</para></listitem> +--> + ソースファイル拡張子のデフォルト値を列挙します。 + このデフォルト値は '.dsc' です。</para></listitem> + </varlistentry> + + <varlistentry><term>Contents::Compress</term> + <listitem><para> +<!-- + This is similar to <literal>Packages::Compress</literal> + except that it controls the compression for the Contents files.</para></listitem> +--> + <literal>Packages::Compress</literal> と同様に、 + Contents ファイルの圧縮方法を指定します。</para></listitem> + </varlistentry> + + <varlistentry><term>DeLinkLimit</term> + <listitem><para> +<!-- + Specifies the number of kilobytes to delink (and + replace with hard links) per run. This is used in conjunction with the + per-section <literal>External-Links</literal> setting.</para></listitem> +--> + 実行するごとに delink (及びハードリンクの置き換え) する量を、 + キロバイト単位で指定します。セクションごとの + <literal>External-Links</literal> 設定と合わせて使います。</para></listitem> + </varlistentry> + + <varlistentry><term>FileMode</term> + <listitem><para> +<!-- + Specifies the mode of all created index files. It + defaults to 0644. All index files are set to this mode with no regard + to the umask.</para></listitem> +--> + 作成したインデックスファイルのモードを指定します。 + デフォルトは 0644 です。全インデックスファイルは、 + umask を無視してこのモードを使用します。</para></listitem> + </varlistentry> + </variablelist> + </refsect2> + +<!-- + <refsect2><title>TreeDefault Section</title> +--> + <refsect2><title>TreeDefault セクション</title> + <para> +<!-- + Sets defaults specific to <literal>Tree</literal> sections. All of these + variables are substitution variables and have the strings $(DIST), + $(SECTION) and $(ARCH) replaced with their respective values.</para> +--> + 特定の <literal>Tree</literal> セクションのデフォルトを設定します。 + これらの変数はすべて置換変数であり、 + 文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値に展開します。</para> + + <variablelist> + <varlistentry><term>MaxContentsChange</term> + <listitem><para> +<!-- + Sets the number of kilobytes of contents + files that are generated each day. The contents files are round-robined + so that over several days they will all be rebuilt.</para></listitem> +--> + 日毎に生成する contents ファイルをキロバイト単位で設定します。 + contents ファイルをラウンドロビンし、数日経つとすべて再生成します。</para></listitem> + </varlistentry> + + <varlistentry><term>ContentsAge</term> + <listitem><para> +<!-- + Controls the number of days a contents file is allowed + to be checked without changing. If this limit is passed the mtime of the + contents file is updated. This case can occur if the package file is + changed in such a way that does not result in a new contents file + [override edit for instance]. A hold off is allowed in hopes that new + .debs will be installed, requiring a new file anyhow. The default is 10, + the units are in days.</para></listitem> +--> + 変更がない contents ファイルをチェックする日数を指定します。 + この制限を越えた contents ファイルの mtime を、更新します。 + パッケージファイルが変更されても、 + [例えば上書き編集で] contents ファイルが更新されないような場合、 + こういったことが発生します。 + 新しい .deb ファイルをインストールしたい場合、保留を解除でき、 + 少なくとも新しいファイルが必要です。 + デフォルトは 10 で、単位は日です。</para></listitem> + </varlistentry> + + <varlistentry><term>Directory</term> + <listitem><para> +<!-- + Sets the top of the .deb directory tree. Defaults to + <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem> +--> + .deb ディレクトリツリーの先頭を設定します。デフォルトは + <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcDirectory</term> + <listitem><para> +<!-- + Sets the top of the source package directory tree. Defaults to + <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem> +--> + ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは + <filename>$(DIST)/$(SECTION)/source/</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>Packages</term> + <listitem><para> +<!-- + Sets the output Packages file. Defaults to + <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem> +--> + Packages ファイルの出力先を設定します。デフォルトは + <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>Sources</term> + <listitem><para> +<!-- + Sets the output Packages file. Defaults to + <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> +--> + Packages ファイルの出力先を設定します。デフォルトは + <filename>$(DIST)/$(SECTION)/source/Sources</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>InternalPrefix</term> + <listitem><para> +<!-- + Sets the path prefix that causes a symlink to be + considered an internal link instead of an external link. Defaults to + <filename>$(DIST)/$(SECTION)/</filename></para></listitem> +--> + 外部リンクではなく、内部リンクと見なす判断材料となる、 + パスのプレフィックスを設定します。デフォルトは、 + <filename>$(DIST)/$(SECTION)/</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>Contents</term> + <listitem><para> +<!-- + Sets the output Contents file. Defaults to + <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple + Packages files to map onto a single Contents file (such as the default) + then <command>apt-ftparchive</command> will integrate those package files + together automatically.</para></listitem> +--> + Contents ファイルの出力先を設定します。デフォルトは、 + <filename>$(DIST)/Contents-$(ARCH)</filename> です。 + 複数の Packages ファイルを ひとつの Contents ファイルにまとめられる設定 + (デフォルト) の場合、<command>apt-ftparchive</command> + は自動でパッケージファイルをまとめます。</para></listitem> + </varlistentry> + + <varlistentry><term>Contents::Header</term> + <listitem><para> +<!-- + Sets header file to prepend to the contents output.</para></listitem> +--> + contents の出力に付けるヘッダファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>BinCacheDB</term> + <listitem><para> +<!-- + Sets the binary cache database to use for this + section. Multiple sections can share the same database.</para></listitem> +--> + このセクションで使用するバイナリキャッシュデータベースを設定します。 + 複数のセクションで同じデータベースを共有できます。</para></listitem> + </varlistentry> + + <varlistentry><term>FileList</term> + <listitem><para> +<!-- + Specifies that instead of walking the directory tree, + <command>apt-ftparchive</command> should read the list of files from the given + file. Relative files names are prefixed with the archive directory.</para></listitem> +--> + ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> + が読み込むファイル一覧ファイルを指定します。 + 相対ファイル名は、アーカイブディレクトリが先頭につきます。</para></listitem> + </varlistentry> + + <varlistentry><term>SourceFileList</term> + <listitem><para> +<!-- + Specifies that instead of walking the directory tree, + <command>apt-ftparchive</command> should read the list of files from the given + file. Relative files names are prefixed with the archive directory. + This is used when processing source indexs.</para></listitem> +--> + ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> + が読み込むファイル一覧ファイルを指定します。 + 相対ファイル名は、アーカイブディレクトリが先頭につきます。 + ソースインデックスを処理する際に使用します。</para></listitem> + </varlistentry> + </variablelist> + </refsect2> + +<!-- + <refsect2><title>Tree Section</title> +--> + <refsect2><title>Tree セクション</title> + <para> +<!-- + The <literal>Tree</literal> section defines a standard Debian file tree which + consists of a base directory, then multiple sections in that base + directory and finally multiple Architectures in each section. The exact + pathing used is defined by the <literal>Directory</literal> substitution variable.</para> +--> + <literal>Tree</literal> セクションでは、 + ベースディレクトリからの標準 Debian ファイルツリー、 + ベースディレクトリの複数のセクション、 + 最終的にはセクションごとの複数のアーキテクチャを定義します。 + 使用する正確なパスは、<literal>Directory</literal> 変数で定義されます。</para> + <para> +<!-- + The <literal>Tree</literal> section takes a scope tag which sets the + <literal>$(DIST)</literal> variable and defines the root of the tree + (the path is prefixed by <literal>ArchiveDir</literal>). + Typically this is a setting such as <filename>dists/woody</filename>.</para> +--> + <literal>Tree</literal> セクションは、 + <literal>$(DIST)</literal> 変数で設定されているスコープタグをとり、 + ツリーのルート (<literal>ArchiveDir</literal>が先頭につくパス) + を定義します。 + 通常、この設定は <filename>dists/woody</filename> のようになります。</para> + <para> +<!-- + All of the settings defined in the <literal>TreeDefault</literal> section can be + use in a <literal>Tree</literal> section as well as three new variables.</para> +--> + <literal>TreeDefault</literal> セクションで定義される設定はすべて、 + 3 個の新しい変数と同様に、 + <literal>Tree</literal> セクションで使用できます。</para> + <para> +<!-- + When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> + performs an operation similar to: +--> + <literal>Tree</literal> セクションを処理する際、 + <command>apt-ftparchive</command> は以下のような操作を行います。 +<informalexample><programlisting> +for i in Sections do + for j in Architectures do + Generate for DIST=scope SECTION=i ARCH=j +</programlisting></informalexample></para> + + <variablelist> + <varlistentry><term>Sections</term> + <listitem><para> +<!-- + This is a space separated list of sections which appear + under the distribution, typically this is something like + <literal>main contrib non-free</literal></para></listitem> +--> + distribution 以下に現れるセクションを、空白区切りで指定したリストです。 + 通常、<literal>main contrib non-free</literal>のようになります。</para></listitem> + </varlistentry> + + <varlistentry><term>Architectures</term> + <listitem><para> +<!-- + This is a space separated list of all the + architectures that appear under search section. The special architecture + 'source' is used to indicate that this tree has a source archive.</para></listitem> +--> + search セクション以下に現れるアーキテクチャを、 + 空白区切りで指定したリストです。 + 特殊アーキテクチャ 'source' は、 + ソースアーカイブのツリーであることを示します。</para></listitem> + </varlistentry> + + <varlistentry><term>BinOverride</term> + <listitem><para> +<!-- + Sets the binary override file. The override file + contains section, priority and maintainer address information.</para></listitem> +--> + バイナリオーバーライドファイルを設定します。 + このオーバーライドファイルには、セクション、優先度、 + メンテナのアドレスといった情報が含まれています。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcOverride</term> + <listitem><para> +<!-- + Sets the source override file. The override file + contains section information.</para></listitem> +--> + ソースオーバーライドファイルを設定します。 + このオーバーライドファイルには、 + セクションの情報が含まれています。</para></listitem> + </varlistentry> + + <varlistentry><term>ExtraOverride</term> + <listitem><para> +<!-- + Sets the binary extra override file.</para></listitem> +--> + バイナリ特別オーバーライドファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcExtraOverride</term> + <listitem><para> +<!-- + Sets the source extra override file.</para></listitem> +--> + ソース特別オーバーライドファイルを設定します。</para></listitem> + </varlistentry> + </variablelist> + </refsect2> + +<!-- + <refsect2><title>BinDirectory Section</title> +--> + <refsect2><title>BinDirectory セクション</title> + <para> +<!-- + The <literal>bindirectory</literal> section defines a binary directory tree + with no special structure. The scope tag specifies the location of + the binary directory and the settings are similar to the <literal>Tree</literal> + section with no substitution variables or + <literal>Section</literal><literal>Architecture</literal> settings.</para> +--> + <literal>bindirectory</literal> セクションでは、 + 特殊な構造を持たないバイナリディレクトリツリーを定義します。 + スコープタグはバイナリディレクトリの場所を指定し、 + 設定は、変数展開のない <literal>Tree</literal> セクションや + <literal>Section</literal><literal>Architecture</literal> 設定に似ています。</para> + <variablelist> + <varlistentry><term>Packages</term> + <listitem><para> +<!-- + Sets the Packages file output.</para></listitem> +--> + Packages ファイルの出力先を設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcPackages</term> + <listitem><para> +<!-- + Sets the Sources file output. At least one of + <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem> +--> + Sources ファイルの出力先を設定します。 + 少なくとも <literal>Packages</literal> や <literal>SrcPackages</literal> + は設定されていなければなりません。</para></listitem> + </varlistentry> + + <varlistentry><term>Contents</term> + <listitem><para> +<!-- + Sets the Contents file output. (optional)</para></listitem> +--> + Contents ファイルの出力先を設定します。(オプション)</para></listitem> + </varlistentry> + + <varlistentry><term>BinOverride</term> + <listitem><para> +<!-- + Sets the binary override file.</para></listitem> +--> + バイナリオーバーライドファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcOverride</term> + <listitem><para> +<!-- + Sets the source override file.</para></listitem> +--> + ソースオーバーライドファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>ExtraOverride</term> + <listitem><para> +<!-- + Sets the binary extra override file.</para></listitem> +--> + バイナリ特別オーバーライドファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>SrcExtraOverride</term> + <listitem><para> +<!-- + Sets the source extra override file.</para></listitem> +--> + ソース特別オーバーライドファイルを設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>BinCacheDB</term> + <listitem><para> +<!-- + Sets the cache DB.</para></listitem> +--> + キャッシュ DB を設定します。</para></listitem> + </varlistentry> + + <varlistentry><term>PathPrefix</term> + <listitem><para> +<!-- + Appends a path to all the output paths.</para></listitem> +--> + 全出力パスに付加するパス。</para></listitem> + </varlistentry> + + <varlistentry><term>FileList, SourceFileList</term> + <listitem><para> +<!-- + Specifies the file list file.</para></listitem> +--> + ファイル一覧ファイルを指定します。</para></listitem> + </varlistentry> + </variablelist> + </refsect2> + </refsect1> + + +<!-- + <refsect1><title>The Binary Override File</title> +--> + <refsect1><title>バイナリオーバーライドファイル</title> +<!-- + <para>The binary override file is fully compatible with &dpkg-scanpackages;. It + contains 4 fields separated by spaces. The first field is the package name, + the second is the priority to force that package to, the third is the + the section to force that package to and the final field is the maintainer + permutation field.</para> +--> + <para>バイナリオーバーライドファイルは、 + &dpkg-scanpackages; と完全に互換性があります。 + ここには、空白区切りでフィールドが 4 個あります。 + 先頭のフィールドはパッケージ名、 + 2 番目のフィールドはパッケージに強制する優先度、 + 3 番目のフィールドはパッケージに強制するセクション、 + 最後のフィールドはメンテナ順列フィールドです。</para> +<!-- + <para>The general form of the maintainer field is: + <literallayout>old [// oldn]* => new</literallayout> + or simply, + <literallayout>new</literallayout> + The first form allows a double-slash separated list of old email addresses + to be specified. If any of those are found then new is substituted for the + maintainer field. The second form unconditionally substitutes the + maintainer field.</para> +--> + <para>メンテナフィールドは一般的には、 + <literallayout>old [// oldn]* => new</literallayout> + という形式か、単純に + <literallayout>new</literallayout> + となります。 + 最初の形式は、// で区切られた古い email アドレスのリストを許可します。 + この形式がある場合は、メンテナフィールドになるよう new に置換してください。 + 2 番目の形式は無条件にメンテナフィールドに置換します。</para> + </refsect1> + + +<!-- + <refsect1><title>The Source Override File</title> +--> + <refsect1><title>ソースオーバーライドファイル</title> + <para> +<!-- + The source override file is fully compatible with &dpkg-scansources;. It + contains 2 fields separated by spaces. The first fields is the source + package name, the second is the section to assign it.</para> +--> + ソースオーバーライドファイルは、 + &dpkg-scansources; と完全に互換性があります。 + ここには、空白区切りでフィールドが 2 個あります。 + 先頭のフィールドはソースパッケージ名、 + 2 番目のフィールドは割り当てるセクションです。</para> + </refsect1> + +<!-- + <refsect1><title>The Extra Override File</title> +--> + <refsect1><title>特別オーバーライドファイル</title> + <para> +<!-- + The extra override file allows any arbitrary tag to be added or replaced + in the output. It has 3 columns, the first is the package, the second is + the tag and the remainder of the line is the new value.</para> +--> + 特別オーバーライドファイルは、 + 出力中に任意のタグを追加・置換できるようにします。 + 3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。</para> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>--md5</option></term> + <listitem><para> +<!-- + Generate MD5 sums. This defaults to on, when turned off the generated + index files will not have MD5Sum fields where possible. + Configuration Item: <literal>APT::FTPArchive::MD5</literal></para></listitem> +--> + MD5 sum を生成します。デフォルトで on になっており、 + off にすると生成したインデックスファイルに MD5Sum フィールドがありません。 + 設定項目 - <literal>APT::FTPArchive::MD5</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-d</option></term><term><option>--db</option></term> + <listitem><para> +<!-- + Use a binary caching DB. This has no effect on the generate command. + Configuration Item: <literal>APT::FTPArchive::DB</literal>.</para></listitem> +--> + バイナリキャッシュ DB を使用します。 + generate コマンドには影響しません。 + 設定項目 - <literal>APT::FTPArchive::DB</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term> + <listitem><para> +<!-- + Quiet; produces output suitable for logging, omitting progress indicators. + More q's will produce more quiet up to a maximum of 2. You can also use + <option>-q=#</option> to set the quiet level, overriding the configuration file. + Configuration Item: <literal>quiet</literal>.</para></listitem> +--> + 静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。 + 最大 2 つまで q を重ねることでより静粛にできます。 + また、<option>-q=#</option> のように静粛レベルを指定して、 + 設定ファイルを上書きすることもできます。 + 設定項目 - <literal>quiet</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--delink</option></term> + <listitem><para> +<!-- + Perform Delinking. If the <literal>External-Links</literal> setting is used then + this option actually enables delinking of the files. It defaults to on and + can be turned off with <option>-\-no-delink</option>. + Configuration Item: <literal>APT::FTPArchive::DeLinkAct</literal>.</para></listitem> +--> + Delink を実行します。 + <literal>External-Links</literal> 設定を使用している場合、 + このオプションはファイルの delink を有効にします。 + デフォルトは on で、 + off にするには <option>--no-delink</option> としてください。 + 設定項目 - <literal>APT::FTPArchive::DeLinkAct</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--contents</option></term> + <listitem><para> +<!-- + Perform contents generation. When this option is set and package indexes + are being generated with a cache DB then the file listing will also be + extracted and stored in the DB for later use. When using the generate + command this option also allows the creation of any Contents files. The + default is on. + Configuration Item: <literal>APT::FTPArchive::Contents</literal>.</para></listitem> +--> + contents の生成を行います。このオプションを指定し、 + パッケージインデックスをキャッシュ DB と共に生成する際、 + ファイルリストを後で使用するように、抽出し DB に格納します。 + generate コマンドを使用する際、 + このオプションでいずれの Contents ファイルも作成できます。 + デフォルトは on です。 + 設定項目 - <literal>APT::FTPArchive::Contents</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-s</option></term><term><option>--source-override</option></term> + <listitem><para> +<!-- + Select the source override file to use with the <literal>sources</literal> command. + Configuration Item: <literal>APT::FTPArchive::SourceOverride</literal>.</para></listitem> +--> + <literal>sources</literal> コマンドで使用する、 + ソースオーバーライドファイルを選択します。 + 設定項目 - <literal>APT::FTPArchive::SourceOverride</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--readonly</option></term> + <listitem><para> +<!-- + Make the caching databases read only. + Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem> +--> + キャッシュデータベースを読み取り専用にします。 + 設定項目 - <literal>APT::FTPArchive::ReadOnlyDB</literal></para></listitem> + </varlistentry> + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- +<refsect1><title>Examples</title> +--> +<refsect1><title>サンプル</title> + +<!-- +<para>To create a compressed Packages file for a directory containing +binary packages (.deb): +--> +<para>バイナリパッケージ (.deb) があるディレクトリの +Packages ファイルを生成するには、以下のようにします。 + +<programlisting> +<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename> +</programlisting></para> + +</refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf;</para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> +<!-- + <para><command>apt-ftparchive</command> returns zero on normal operation, decimal 100 on error.</para> +--> + <para><command>apt-ftparchive</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。</para> + </refsect1> + + &manbugs; + &translator; + +</refentry> diff --git a/doc/ja/apt-get.ja.8.sgml b/doc/ja/apt-get.ja.8.sgml deleted file mode 100644 index 156f83699..000000000 --- a/doc/ja/apt-get.ja.8.sgml +++ /dev/null @@ -1,857 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!-- translation of version 1.12 --> -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ - -<!ENTITY % aptent SYSTEM "apt.ent.ja"> -%aptent; - -]> - -<refentry lang=ja> - &apt-docinfo; - - <refmeta> - <refentrytitle>apt-get</> - <manvolnum>8</> - </refmeta> - - <!-- Man page title --> - <refnamediv> - <refname>apt-get</> -<!-- - <refpurpose>APT package handling utility - - command-line interface</> ---> - <refpurpose>APT ѥå桼ƥƥ -- ޥɥ饤ե</> - </refnamediv> - - <!-- Arguments --> - <refsynopsisdiv> - <cmdsynopsis> - <command>apt-get</> - <arg><option>-hvs</></arg> - <arg><option>-o=<replaceable/config string/</></arg> - <arg><option>-c=<replaceable/file/</></arg> - <group choice=req> - <arg>update</> - <arg>upgrade</> - <arg>dselect-upgrade</> - <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>check</> - <arg>clean</> - <arg>autoclean</> - </group> - </cmdsynopsis> - </refsynopsisdiv> - -<!-- - <RefSect1><Title>Description</> ---> - <RefSect1><Title></> - <para> -<!-- - <command/apt-get/ is the command-line tool for handling packages, and may be - considered the user's "back-end" to other tools using the APT library. ---> - <command/apt-get/ ϥѥå륳ޥɥ饤ġǡ - APT 饤֥Ѥ¾ΥġΥ桼¦ХåɤȤ⤤ΤǤ - </para> - <para> -<!-- - Unless the <option/-h/, or <option/- -help/ option is given one of the - commands below must be present. ---> - <option/-h/ <option/--help/ ʲ˵륳ޥɤɬפǤ - </para> - <VariableList> - <VarListEntry><Term>update</Term> - <ListItem><Para> -<!-- - <literal/update/ is used to resynchronize the package index files from - their sources. The indexes of available packages are fetched from the - location(s) specified in <filename>/etc/apt/sources.list</>. - For example, when using a Debian archive, this command retrieves and - scans the <filename>Packages.gz</> files, so that information about new - and updated packages is available. An <literal/update/ should always be - performed before an <literal/upgrade/ or <literal/dist-upgrade/. Please - be aware that the overall progress meter will be incorrect as the size - of the package files cannot be known in advance. ---> - <literal/update/ Ϥ줾ѥåǥåե - ƱԤΤ˻ѤޤѲǽʥѥåΥǥå - <filename>/etc/apt/sources.list</> ˵Ҥ꤫ޤ - 㤨 Debian archive ѤݡΥޥɤ <filename>Packages.gz</> - ե뤳ȤǡޤϹ줿ѥåξѲǽ - Ȥʤޤ<literal/update/ <literal/upgrade/ - <literal/dist-upgrade/ Ԥ˾˼¹Ԥ٤Ǥ - äƥѥåեΥΤ뤳ȤǤʤᡢ - ΤΥץ쥹ɽޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>upgrade</Term> - <ListItem><Para> -<!-- - <literal/upgrade/ is used to install the newest versions of all packages - currently installed on the system from the sources enumerated in - <filename>/etc/apt/sources.list</>. Packages currently installed with - new versions available are retrieved and upgraded; under no circumstances - are currently installed packages removed, or packages not already installed - retrieved and installed. New versions of currently installed packages that - cannot be upgraded without changing the install status of another package - will be left at their current version. An <literal/update/ must be - performed first so that <command/apt-get/ knows that new versions of packages are - available. ---> - <literal/upgrade/ ϡߥƥ˥ȡ뤵Ƥѥå - ǿС<filename>/etc/apt/sources.list</> - ȡ뤹Τ˻ѤޤߥȡΥѥå˿ - Сйޤʤ⸽ߥȡ - ѥåκϹԤޤоݤΥѥå - ¾ΥѥåΥȡ֤ѹ˹Ǥʤϡ - ߤΥСΤޤޤȤʤޤ - <literal/update/ Ϥ˼¹ԤƤơ<command/apt-get/ - ѥåοСѤǤ뤳ȤΤ餻ɬפޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>dselect-upgrade</Term> - <ListItem><Para> -<!-- - is used in conjunction with the traditional Debian GNU/Linux packaging - front-end, &dselect;. <literal/dselect-upgrade/ - follows the changes made by &dselect; to the <literal/Status/ - field of available packages, and performs the actions necessary to realize - that state (for instance, the removal of old and the installation of new - packages). ---> - Ū Debian GNU/Linux ѥåեȥɤ &dselect; - ȶ˻Ѥޤ<literal/dselect-upgrade/ &dselect; Ǻ줿 - Ѳǽѥå <literal/Status/ եɤѹפ - ξ֤ȿǤΤɬפʥ¹Ԥޤ - (㤨СŤѥåκ俷ѥåΥȡʤ) - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>dist-upgrade</Term> - <ListItem><Para> -<!-- - <literal/dist-upgrade/, in addition to performing the function of - <literal/upgrade/, also intelligently handles changing dependencies - with new versions of packages; <command/apt-get/ has a "smart" conflict - resolution system, and it will attempt to upgrade the most important - packages at the expense of less important ones if necessary. - The <filename>/etc/apt/sources.list</> file contains a list of locations - from which to retrieve desired package files. ---> - <literal/dist-upgrade/ <literal/upgrade/ εǽ˲äС - ѥåФ¸طѹŪޤ - <command/apt-get/ ϡ줿襷ƥɬפʤ - ŪפǤʤѥåˤơǽץѥåι - ߤޤ - <filename>/etc/apt/sources.list</> եɬפʥѥåե - ΥꥹȤޤޤƤޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>install</Term> - <ListItem><Para> -<!-- - <literal/install/ is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not em(libc6_1.9.6-2.deb)). All packages required - by the package(s) specified for installation will also be retrieved and - installed. The <filename>/etc/apt/sources.list</> file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system. ---> - <literal/install/ θˤϥȡ뤹ѥå1İʾꤷޤ - ꤹѥåϡʥե̾ǤϤʤѥå̾Ǥ - (㤨 Debian GNU/Linux ƥǤ libc6_1.9.6-2.deb ǤϤʤ libc6 - ȤͿޤ) ȡ뤹褦ꤷ٤ƤΥѥåФ - ȡԤޤ<filename>/etc/apt/sources.list</> ե - ᤹ѥåξꤹΤ˻Ѥޤ - ѥå̾θ (ޤޤ) ϥեɲäƤ硢 - Υѥåȡ뤵Ƥкޤ - Ʊͤˡȡ뤹ѥåΤ˥ץ饹ѤǤޤ - ʸ apt-get ζ襷ƥȽǤѤ뤫⤷ޤ - </para> - <para> -<!-- - A specific version of a package can be selected for installation by - following the package name with an equals and the version of the package - to select. This will cause that version to be located and selected for - install. Alternatively a specific distribution can be selected by - following the package name with a slash and the version of the - distribution or the Archive name (stable, frozen, unstable). ---> - ѥå˥뵭ȥС³뤳Ȥǡ - СΥѥåȡ뤹뤳ȤǤޤ - ĤޤΥСΥѥåȡ뤹褦 - ȤȤǤ - ̤ˡȤƤϡǥȥӥ塼ꤹΤˡ - ѥå̾θ³ƥåȥǥȥӥ塼ΥС - ̾ (stable, frozen, unstable) ҤǤޤ - </para> - <para> - Сϥ졼ɻˤѤǤ뤿ᡢդʧä - ѤʤФʤޤ - </para> - <para> -<!-- - If no package matches the given expression and the expression contains one - of '.', '?' or '*' then it is assumed to be a POSIX regex and it is applied - to all package names in the database. Any matches are then installed (or - removed). Note that matching is done by substring so 'lo.*' matches 'how-lo' - and 'lowest'. If this is undesired prefix with a '^' character. ---> - ⤷'.''?''*'ޤʸ˰Ĥѥå̾ޥåʤä硢 - POSIX ɽǤȸʤǡ١ѥå̾Ф - ŬѤޤ - ޥåѥå٤Ƥȡ(⤷Ϻ)ޤ - ) 'lo.*' Τ褦ʸ 'how-lo' 'lowest' ˥ޥåޤ - ˾ޤʤСƬ '^' ĤƤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>remove</Term> - <ListItem><Para> -<!-- - <literal/remove/ is identical to <literal/install/ except that packages are - removed instead of installed. If a plus sign is appended to the package - name (with no intervening space), the identified package will be - installed. ---> - <literal/remove/ ѥå뤳Ȥ<literal/install/ - ƱͤǤ - ץ饹椬ѥå̾ (֤˶ޤޤ) ղä줿硢 - ̤줿ѥåȡ뤷ޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>source</Term> - <ListItem><Para> -<!-- - <literal/source/ causes <command/apt-get/ to fetch source packages. APT - will examine the available packages to decide which source package to - fetch. It will then find and download into the current directory the - newest available version of that source package. Source packages are - tracked separately from binary packages via <literal/deb-src/ type lines - in the &sources-list; file. This probably will mean that you will not - get the same source as the package you have installed or as you could - install. If the - -compile options is specified then the package will be - compiled to a binary .deb using dpkg-buildpackage, if - -download-only is - specified then the source package will not be unpacked. ---> - <literal/source/ ϥѥå褦 <command/apt-get/ - 뤳Ȥ̣ޤ - APT ϤɤΥѥå뤫ꤹ褦Ѳǽʥѥå - Ƥޤ - θ塢ǿѲǽʥѥåĤȥǥ쥯ȥ - ɤޤ - ѥåϡХʥѥåȤ̤ &sources-list; ե - <literal/deb-src/ Ԥפޤ - ϡȡ뤷 (ޤϥȡǤ) ѥåȡ - Ѥ뤳ȤǤ뤳ȤƤޤ - --compile ץꤵ줿硢dpkg-buildpackage Ѥ - Хʥ .deb եإѥԤޤ - --download-only ξϥѥåŸޤ - </para> - <para> -<!-- - A specific source version can be retrieved by postfixing the source name - with an equals and then the version to fetch, similar to the mechanism - used for the package files. This enables exact matching of the source - package name and version, implicitly enabling the - <literal/APT::Get::Only-Source/ option. ---> - ѥåƱͤˡ̾θ˥ȼС - ֤ȤǡꤷСΥ뤳ȤǤޤ - <literal/APT::Get::Only-Source/ ץǰۤΤͭˤʤä - 뤿ᡢѥå̾ȥС˸̩˥ޥå褦 - ʤäƤޤ - </para> - - <para> -<!-- - Note that source packages are not tracked like binary packages, they - exist only in the current directory and are similar to downloading source - tar balls. ---> - ) tar ball ϥȥǥ쥯ȥˤΤߥɤ졢 - ȥǥ쥯ȥŸޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>build-dep</Term> - <ListItem><Para> -<!-- - <literal/build-dep/ causes apt-get to install/remove packages in an - attempt to satisfy the build dependencies for a source packages. ---> - <literal/build-dep/ ϥѥåι۰¸ط褦ˡ - ѥåΥȡ롦Ԥޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>check</Term> - <ListItem><Para> -<!-- - <literal/check/ is a diagnostic tool; it updates the package cache and checks - for broken dependencies. ---> - <literal/check/ ϡѥååι줿¸طå - ǥġǤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>clean</Term> - <ListItem><Para> -<!-- - <literal/clean/ clears out the local repository of retrieved package - files. It removes everything but the lock file from - <filename>&cachedir;/archives/</> and - <filename>&cachedir;/archive/partial/</>. When APT is used as a - &dselect; method, <literal/clean/ is run automatically. - Those who do not use dselect will likely want to run <literal/apt-get clean/ - from time to time to free up disk space. - --> - <literal/clean/ ϼѥåΥݥȥݽޤ - <filename>&cachedir;/archives/</> - <filename>&cachedir;/archive/partial/</> - åեʳ٤ƺޤ - APT &dselect; ƤФȤˤϡưŪ <literal/clean/ - ¹Ԥޤ - dselectѤʤϡǥڡ뤿ᡢ - <literal/apt-get clean/ ¹ԤʤǤ礦 - </Para></ListItem> - </VarListEntry> - - <VarListEntry><Term>autoclean</Term> - <ListItem><Para> -<!-- - Like <literal/clean/, <literal/autoclean/ clears out the local - repository of retrieved package files. The difference is that it only - removes package files that can no longer be downloaded, and are largely - useless. This allows a cache to be maintained over a long period without - it growing out of control. The configuration option - <literal/APT::Clean-Installed/ will prevent installed packages from being - erased if it is set off. ---> - <literal/clean/ Ʊ͡<literal/autoclean/ ϼѥåΥ - ݥȥݽޤ㤤ϡ⤦ɤ뤳Ȥʤ - ѥåե䡢ۤȤפʥѥåեΤߤ뤳ȤǤ - ΤᡢĹ֡å夬Ǥ粽뤳Ȥʤ - ݻ뤳ȤǤޤ - ꥪץ <literal/APT::Clean-Installed/ off åȤƤС - ȡѤΥѥåե뤬ΤɤȤǤޤ - </Para></ListItem> - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>ץ</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-d/</><term><option/--download-only/</> - <ListItem><Para> -<!-- - Download only; package files are only retrieved, not unpacked or installed. - Configuration Item: <literal/APT::Get::Download-Only/. ---> - ɤΤ - ѥåեμΤߤԤ - ŸȡԤޤ - - <literal/APT::Get::Download-Only/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--fix-broken/</> - <ListItem><Para> -<!-- - Fix; attempt to correct a system with broken dependencies in - place. This option, when used with install/remove, can omit any packages - to permit APT to deduce a likely soltion. Any Package that are specified - must completly correct the problem. The option is sometimes necessary when - running APT for the first time; APT itself does not allow broken package - dependencies to exist on a system. It is possible that a system's - dependency structure can be so corrupt as to require manual intervention - (which usually means using &dselect; or <command/dpkg - -remove/ to eliminate some of - the offending packages). Use of this option together with <option/-m/ may produce an - error in some situations. - Configuration Item: <literal/APT::Get::Fix-Broken/. ---> - - ¸ط줿ƥνߤޤ - Υץ install remove Ȱ˻ȤȤϡѥå - ꤷʤƤ⤫ޤޤɤΥѥåꤷƤ⡢ - 褷ޤ - APT Τϥƥ¸ߤ줿ѥå¸طȤǤʤ - Τǡ APT ¹Ԥ硢Υץɬפˤʤ뤳Ȥޤ - ƥΰ¸ط¤ˤʤ꤬ϡưǽ褦 - ᤹뤳Ȥޤ - (̾ϡΤѥåΤ&dselect; - <command/dpkg --remove/ Ѥޤ) - Υץ <option/-m/ ץƱ˻Ѥȡ - Ǥϥ顼ˤʤ뤫⤷ޤ - - <literal/APT::Get::Fix-Broken/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</> - <term><option/--fix-missing/</> - <ListItem><Para> -<!-- - Ignore missing packages; If packages cannot be retrieved or fail the - integrity check after retrieval (corrupted package files), hold back - those packages and handle the result. Use of this option together with - <option/-f/ may produce an error in some situations. If a package is - selected for installation (particularly if it is mentioned on the - command line) and it could not be downloaded then it will be silently - held back. - Configuration Item: <literal/APT::Get::Fix-Missing/. ---> - ѥå̵ - ѥåǤʤäꡢ - (ѥå») å̤ʤä硢 - ΥѥåναǸޤǽ³ޤ - Υץ <option/-f/ ץƱ˻Ѥȡ - Ǥϥ顼ˤʤ뤫⤷ޤ - ѥåȡ뤹褦Ƥ - (ä˥ޥɥ饤Ǥ) 䡢ɤǤʤä - ʤˤɽα뤳Ȥˤʤޤ - - <literal/APT::Get::Fix-Missing/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--no-download/</> - <ListItem><Para> -<!-- - Disables downloading of packages. This is best used with - <option/- -ignore-missing/ to force APT to use only the .debs it has - already downloaded. - Configuration Item: <literal/APT::Get::Download/. ---> - ѥåΥɤޤϤǤ˥ɤ .deb - ФƤΤAPTԤݤˡ<option/--ignore-missing/ ʻ - ȤΤ褤Ǥ礦 - - <literal/APT::Get::Download/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-q/</><term><option/--quiet/</> - <ListItem><Para> -<!-- - Quiet; produces output suitable for logging, omitting progress indicators. - More q's will produce more quiet up to a maximum of 2. You can also use - <option/-q=#/ to set the quiet level, overriding the configuration file. - Note that quiet level 2 implies <option/-y/, you should never use -qq - without a no-action modifier such as -d, - -print-uris or -s as APT may - decided to do something you did not expect. - Configuration Item: <literal/quiet/. ---> - Ų - ĽɽάƥȤΤʽϤԤޤ - 2 Ĥޤ q Ťͤ뤳ȤǤŤˤǤޤ - ޤ<option/-q=#/ Τ褦Ų٥ꤷơե - 뤳ȤǤޤ - ) Ų٥ 2 <option/-y/ ΰ̣ޤǤޤ - APT տޤʤԤ⤷ʤΤ -d, --print-uris, -s Τ褦 - ԤʤץĤ -qq Ѥ٤ǤϤޤ - - <literal/quiet/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-s/</> - <term><option/--simulate/</> - <term><option/--just-print/</> - <term><option/--dry-run/</> - <term><option/--recon/</> - <term><option/--no-act/</> - <ListItem><Para> -<!-- - No action; perform a simulation of events that would occur but do not - actually change the system. - Configuration Item: <literal/APT::Get::Simulate/. ---> - ưʤ - ʤˤΤΥߥ졼Ԥ - ºݤΥƥѹϤޤ - - <literal/APT::Get::Simulate/ - </para> - <para> -<!-- - Simulate prints out - a series of lines each one representing a dpkg operation, Configure (Conf), - Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with - and empty set of square brackets meaning breaks that are of no consequence - (rare). ---> - ߥ졼Ȥη̡dpkg ưɽϢιԤΤ줾ˡ (Conf) - (Remv) Ÿ (Inst) ɽޤ - ѥåϲ줿ѥåɽγѥå礷ǤϤʤȤ - ɽޤ(ޤǤ) - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-y/</><term><option/--yes/</> - <term><option/--assume-yes/</> - <ListItem><Para> -<!-- - Automatic yes to prompts; assume "yes" as answer to all prompts and run - non-interactively. If an undesirable situation, such as changing a held - package or removing an essential package occurs then <literal/apt-get/ - will abort. - Configuration Item: <literal/APT::Get::Assume-Yes/. ---> - ץץȤؤμư - ٤ƤΥץץȤ˼ưŪ "yes" - Ū˼¹Ԥޤ - αѥåξ֤ѹꡢɬܥѥå褦Ŭڤʾξ硢 - <literal/apt-get/ ǤǤ礦 - - <literal/APT::Get::Assume-Yes/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</> - <ListItem><Para> -<!-- - Show upgraded packages; Print out a list of all packages that are to be - upgraded. - Configuration Item: <literal/APT::Get::Show-Upgraded/. ---> - ѥåɽ - ѥåΰɽޤ - - <literal/APT::Get::Show-Upgraded/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-b/</><term><option/--compile/</> - <term><option/--build/</> - <ListItem><Para> -<!-- - Compile source packages after downloading them. - Configuration Item: <literal/APT::Get::Compile/. ---> - ѥåɸ塢ѥ뤷ޤ - - <literal/APT::Get::Compile/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--ignore-hold/</> - <ListItem><Para> -<!-- - Ignore package Holds; This causes <command/apt-get/ to ignore a hold - placed on a package. This may be useful in conjunction with - <literal/dist-upgrade/ to override a large number of undesired holds. - Configuration Item: <literal/APT::Ignore-Hold/. ---> - αѥå̵ - ѥåαؼ̵뤷 <command/apt-get/ - Ԥޤ - ̤ΥѥåαβΤ <literal/dist-upgrade/ ȶ - ѤǤ - - <literal/APT::Ignore-Hold/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--no-upgrade/</> - <ListItem><Para> -<!-- - Do not upgrade packages; When used in conjunction with <literal/install/ - <literal/no-upgrade/ will prevent packages listed from being upgraded - if they are already installed. - Configuration Item: <literal/APT::Get::Upgrade/. ---> - ѥåʤ - <literal/install/ Ʊ˻Ѥȡ - <literal/no-upgrade/ ϻꤷѥåǤ˥ȡ뤷Ƥ - Ԥޤ - - <literal/APT::Get::Upgrade/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--force-yes/</> - <ListItem><Para> -<!-- - Force yes; This is a dangerous option that will cause apt to continue - without prompting if it is doing something potentially harmful. It - should not be used except in very special situations. Using - <literal/force-yes/ can potentially destroy your system! - Configuration Item: <literal/APT::Get::force-yes/. ---> - - APT »Ϳͤʤư褦ȤǤ⡢ - ǧϤʤǼ¹ԤƤޤʥץǤ - ۤɤξǤʤСѤʤǤ礦 - <literal/force-yes/ ϤʤΥƥ˲ͤޤ! - - <literal/APT::Get::force-yes/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--print-uris/</> - <ListItem><Para> -<!-- - Instead of fetching the files to install their URIs are printed. Each - URI will have the path, the destination file name, the size and the expected - md5 hash. Note that the file name to write to will not always match - the file name on the remote site! This also works with the - <literal/source/ and <literal/update/ commands. When used with the - <literal/update/ command the MD5 and size are not included, and it is - up to the user to decompress any compressed files. - Configuration Item: <literal/APT::Get::Print-URIs/. ---> - ȡ뤹եˡURIɽޤ - URIˤϡѥоݥե̾ե륵ͽ¬ md5 ϥå - ޤޤƤޤ - ) Ϥե̾˥⡼ȥȤΥե̾Ȱפ櫓 - ǤϤޤ! <literal/source/ ޥɡ <literal/update/ - ޥɤǤưޤ - MD5 ե륵ޤޤ <literal/update/ ǻѤȤˡ - ̥եŸ뤳Ȥϥ桼ǤˤƹԤäƤ - - <literal/APT::Get::Print-URIs/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--purge/</> - <ListItem><Para> -<!-- - Use purge instead of remove for anything that would be removed. - Configuration Item: <literal/APT::Get::Purge/. ---> - 硢ǤϤʤѤޤ - - <literal/APT::Get::Purge/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--reinstall/</> - <ListItem><Para> -<!-- - Re-Install packages that are already installed and at the newest version. - Configuration Item: <literal/APT::Get::ReInstall/. ---> - Ǥ˺ǿǤȡ뤵ƤƤ⡢ѥåƥȡ뤷ޤ - - <literal/APT::Get::ReInstall/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--list-cleanup/</> - <ListItem><Para> -<!-- - This option defaults to on, use <literal/- -no-list-cleanup/ to turn it - off. When on <command/apt-get/ will automatically manage the contents of - <filename>&statedir;/lists</> to ensure that obsolete files are erased. - The only reason to turn it off is if you frequently change your source - list. - Configuration Item: <literal/APT::Get::List-Cleanup/. ---> - εǽϥǥեȤ ON ˤʤäƤޤ - OFF ˤˤ <literal/--no-list-cleanup/ ȤƤ - ON ξ硢<command/apt-get/ ϸŤʤäեμ¤˾õ뤿ᡢ - ưŪ <filename>&statedir;/lists</> ȤǤ礦 - OFF ˤΤϡʤꥹȤˤѹ餤Ǥ - - <literal/APT::Get::List-Cleanup/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-t/</> - <term><option/--target-release/</> - <term><option/--default-release/</> - <ListItem><Para> -<!-- - This option controls the default input to the policy engine, it creates - a default pin at priority 990 using the specified release string. The - preferences file may further override this setting. In short, this option - lets you have simple control over which distribution packages will be - retrieved from. Some common examples might be - <option>-t '2.1*'</> or <option>-t unstable</>. - Configuration Item: <literal/APT::Default-Release/ ---> - ΥץϥݥꥷؤΥǥեϤ椷ޤ - ϡꤵ줿ʸѤǥե pin ͥ 990 - Ǻ뤳ȤǤ - ͥեϤޤ - פˤΥץϡɤۥѥå뤫ñ - Ƥޤ - ĤŪϡ<option>-t '2.1*'</> <option>-t unstable</> - Ǥ礦 - - <literal/APT::Default-Release/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--trivial-only/</> - <ListItem><Para> -<!-- - Only perform operations that are 'trivial'. Logically this can be considered - related to <option/- -assume-yes/, where <option/- -assume-yes/ will answer - yes to any prompt, <option/- -trivial-only/ will answer no. - Configuration Item: <literal/APT::Get::Trivial-Only/. ---> - ֽפǤʤΤߤԤޤŪ <option/--assume-yes/ - ֤ȸʤȤǤޤ<option/--assume-yes/ ϼˤ٤ yes - ޤ<option/--trivial-only/ Ϥ٤ no ޤ - - <literal/APT::Get::Trivial-Only/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--no-remove/</> - <ListItem><Para> -<!-- - If any packages are to be removed apt-get immediately aborts without - prompting. - Configuration Item: <literal/APT::Get::Remove/ ---> - ѥåˤʤäȤץץȤɽǤޤ - - <literal/APT::Get::Remove/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--only-source/</> - <ListItem><Para> -<!-- - Only has meaning for the <literal/source/ command. indicates that the - given source names are not to be mapped through the binary table. - Configuration Item: <literal/APT::Get::Only-Source/ ---> - <literal/source/ ޥɤǤΤ̣߰ޤ - ꤵ줿̾Хʥơ֥˥ޥåפʤȤޤ - - <literal/APT::Get::Only-Source/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</> - <ListItem><Para> -<!-- - Download only the diff or tar file of a source archive. - Configuration Item: <literal/APT::Get::Diff-Only/ and - <literal/APT::Get::Tar-Only/ ---> - ֤ diff ե tar եΥɤΤߤԤޤ - - <literal/APT::Get::Diff-Only/ <literal/APT::Get::Tar-Only/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/--arch-only/</> - <ListItem><Para> -<!-- - Only process architecture-dependent build-dependencies. - Configuration Item: <literal/APT::Get::Arch-Only/ ---> - ۰¸طβƥ˰¸ΤΤ߹Ԥޤ - - <literal/APT::Get::Arch-Only/ - </Para></ListItem> - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>ե</> - <variablelist> - <VarListEntry><term><filename>/etc/apt/sources.list</></term> - <ListItem><Para> -<!-- - locations to fetch packages from. - Configuration Item: <literal/Dir::Etc::SourceList/. ---> - ѥåμ - - <literal/Dir::Etc::SourceList/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/apt.conf</></term> - <ListItem><Para> -<!-- - APT configuration file. - Configuration Item: <literal/Dir::Etc::Main/. ---> - APT ե롣 - - <literal/Dir::Etc::Main/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term> - <ListItem><Para> -<!-- - APT configuration file fragments - Configuration Item: <literal/Dir::Etc::Parts/. ---> - APT եҡ - - <literal/Dir::Etc::Parts/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/preferences</></term> - <ListItem><Para> -<!-- - version preferences file - Configuration Item: <literal/Dir::Etc::Preferences/. ---> - Сͥե롣 - - <literal/Dir::Etc::Preferences/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>&cachedir;/archives/</></term> - <ListItem><Para> -<!-- - storage area for retrieved package files. - Configuration Item: <literal/Dir::Cache::Archives/. ---> - ѤߥѥåեǼꥢ - - <literal/Dir::Cache::Archives/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>&cachedir;/archives/partial/</></term> - <ListItem><Para> -<!-- - storage area for package files in transit. - Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial). ---> - ѥåեǼꥢ - - <literal/Dir::Cache::Archives/ (ɬŪԴǤ) - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/</></term> - <ListItem><Para> -<!-- - storage area for state information for each package resource specified in - &sources-list; - Configuration Item: <literal/Dir::State::Lists/. ---> - &sources-list; Υѥåͭξ־Ǽꥢ - - <literal/Dir::State::Lists/ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/partial/</></term> - <ListItem><Para> -<!-- - storage area for state information in transit. - Configuration Item: <literal/Dir::State::Lists/ (implicit partial). ---> - ξ־Ǽꥢ - - <literal/Dir::State::Lists/ (ɬŪԴǤ) - </Para></ListItem> - </VarListEntry> - </variablelist> - </RefSect1> - - <RefSect1><Title>Ϣ</> - <para> - &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, - &docdir; APT 桼, &apt-preferences; - </para> - </RefSect1> - - <RefSect1><Title>ǥå</> - <para> - <command/apt-get/ ｪλ 0 ֤ޤ - 顼ˤϽʤ 100 ֤ޤ - </para> - </RefSect1> - - &manbugs; - &manauthor; - &translator; -</refentry> diff --git a/doc/ja/apt-get.ja.8.xml b/doc/ja/apt-get.ja.8.xml new file mode 100644 index 000000000..f503b89ef --- /dev/null +++ b/doc/ja/apt-get.ja.8.xml @@ -0,0 +1,900 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-get</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-get</refname> +<!-- + <refpurpose>APT package handling utility -\- command-line interface</refpurpose> +--> + <refpurpose>APT package handling utility -- コマンドラインインターフェース</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-get</command> + <arg><option>-hvs</option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <group choice="req"> + <arg>update</arg> + <arg>upgrade</arg> + <arg>dselect-upgrade</arg> + <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>check</arg> + <arg>clean</arg> + <arg>autoclean</arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-get</command> is the command-line tool for handling packages, and may be + considered the user's "back-end" to other tools using the APT + library. Several "front-end" interfaces exist, such as dselect(8), + aptitude, synaptic, gnome-apt and wajig.</para> +--> + <para><command>apt-get</command> は、 + パッケージを操作するコマンドラインツールで、 + APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。 + 「フロントエンド」インターフェースには、dselect(8), + aptitude, synaptic, gnome-apt, wajig などがあります。</para> + +<!-- + <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the + commands below must be present.</para> +--> + <para><option>-h</option> オプションや <option>--help</option> オプションを除き、 + 以下に挙げるコマンドが必要です。</para> + + <variablelist> + <varlistentry><term>update</term> +<!-- + <listitem><para><literal>update</literal> is used to resynchronize the package index files from + their sources. The indexes of available packages are fetched from the + location(s) specified in <filename>/etc/apt/sources.list</filename>. + For example, when using a Debian archive, this command retrieves and + scans the <filename>Packages.gz</filename> files, so that information about new + and updated packages is available. An <literal>update</literal> should always be + performed before an <literal>upgrade</literal> or <literal>dist-upgrade</literal>. Please + be aware that the overall progress meter will be incorrect as the size + of the package files cannot be known in advance.</para></listitem> +--> + <listitem><para><literal>update</literal>は、 + 取得元からパッケージインデックスファイルの再同期を行うのに使用します。 + 利用可能なパッケージのインデックスは、 + <filename>/etc/apt/sources.list</filename> に記述した場所から取得します。 + 例えば Debian アーカイブを利用する際、 + このコマンドが <filename>Packages.gz</filename> ファイルを検索することで、 + 新規または更新されたパッケージの情報が利用可能となります。 + <literal>update</literal> は、<literal>upgrade</literal> や + <literal>dist-upgrade</literal> を行う前に常に実行してください。 + 前もってパッケージファイルのサイズを知ることができないため、 + 全体の進捗メータは正しく表示されません。</para></listitem> + </varlistentry> + + <varlistentry><term>upgrade</term> +<!-- + <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages + currently installed on the system from the sources enumerated in + <filename>/etc/apt/sources.list</filename>. Packages currently installed with + new versions available are retrieved and upgraded; under no circumstances + are currently installed packages removed, or packages not already installed + retrieved and installed. New versions of currently installed packages that + cannot be upgraded without changing the install status of another package + will be left at their current version. An <literal>update</literal> must be + performed first so that <command>apt-get</command> knows that new versions of packages are + available.</para></listitem> +--> + <listitem><para><literal>upgrade</literal> は、 + 現在システムにインストールされている全パッケージの最新バージョンを、 + <filename>/etc/apt/sources.list</filename> + に列挙した取得元からインストールするのに使用します。 + 現在インストール中のパッケージに新しいバージョンがあれば更新しますが、 + いかなる時も現在インストール中のパッケージの削除は行いません。 + 対象のパッケージが、 + 他のパッケージのインストール状態を変更せずに更新できない場合は、 + 現在のバージョンのままとなります。 + 最初に <literal>update</literal> を実行しておき、 + <command>apt-get</command> にパッケージの新しいバージョンがあることを + 知らせる必要があります。</para></listitem> + </varlistentry> + + <varlistentry><term>dselect-upgrade</term> +<!-- + <listitem><para><literal>dselect-upgrade</literal> + is used in conjunction with the traditional Debian packaging + front-end, &dselect;. <literal>dselect-upgrade</literal> + follows the changes made by &dselect; to the <literal>Status</literal> + field of available packages, and performs the actions necessary to realize + that state (for instance, the removal of old and the installation of new + packages).</para></listitem> +--> + <listitem><para><literal>dselect-upgrade</literal> は、 + 伝統的な Debian GNU/Linux パッケージ管理フロントエンドの &dselect; + と共に使用されます。 + <literal>dselect-upgrade</literal> は、 + &dselect; で作られた利用可能パッケージの + <literal>Status</literal> フィールドの変更を追跡し、 + その状態を反映させるのに必要なアクションを実行します。 + (例えば、古いパッケージの削除や新しいパッケージのインストールなど) </para></listitem> + + </varlistentry> + + <varlistentry><term>dist-upgrade</term> +<!-- + <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of + <literal>upgrade</literal>, also intelligently handles changing dependencies + with new versions of packages; <command>apt-get</command> has a "smart" conflict + resolution system, and it will attempt to upgrade the most important + packages at the expense of less important ones if necessary. + The <filename>/etc/apt/sources.list</filename> file contains a list of locations + from which to retrieve desired package files. + See also &apt-preferences; for a mechanism for + overriding the general settings for individual packages.</para></listitem> +--> + <listitem><para><literal>dist-upgrade</literal> は、 + <literal>upgrade</literal> の機能に加え、 + 新バージョンのパッケージに対する依存関係の変更を知的に操作します。 + <command>apt-get</command> は「洗練された」競合解決システムを持ち、 + 必要とあらば比較的重要でないパッケージを犠牲にして、 + 最重要パッケージの更新を試みます。 + <filename>/etc/apt/sources.list</filename> ファイルには、 + 必要なパッケージファイルを検索する場所のリストが含まれています。 + 特定のパッケージ向けに、一般的な設定を上書きする機構については、 + &apt-preferences; をご覧ください。</para></listitem> + </varlistentry> + + <varlistentry><term>install</term> +<!-- + <listitem><para><literal>install</literal> is followed by one or more packages desired for + installation. Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, libc6 would be the + argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required + by the package(s) specified for installation will also be retrieved and + installed. The <filename>/etc/apt/sources.list</filename> file is used to locate + the desired packages. If a hyphen is appended to the package name (with + no intervening space), the identified package will be removed if it is + installed. Similarly a plus sign can be used to designate a package to + install. These latter features may be used to override decisions made by + apt-get's conflict resolution system.</para> +--> + <listitem><para><literal>install</literal> の後には、 + インストールするパッケージを 1 つ以上指定します。 + 指定するパッケージは、完全なファイル名ではなくパッケージ名です。 + (例えば Debian GNU/Linux システムでは、 + <literal>libc6_1.9.6-2.deb</literal> ではなく libc6 を引数として与えます) + インストールするよう指定したすべてのパッケージに対し、 + 検索・インストールを行います。 + <filename>/etc/apt/sources.list</filename> ファイルを、 + 要求するパッケージの場所を特定するのに使用します。 + パッケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、 + そのパッケージがインストールされていれば削除します。 + 同様に、インストールするパッケージを明示するのにプラス記号も使用できます。 + この記号は apt-get の競合解決システムの判断に利用されるかもしれません。</para> + +<!-- + <para>A specific version of a package can be selected for installation by + following the package name with an equals and the version of the package + to select. This will cause that version to be located and selected for + install. Alternatively a specific distribution can be selected by + following the package name with a slash and the version of the + distribution or the Archive name (stable, testing, unstable).</para> +--> + <para>パッケージにイコール記号とバージョンを続けることで、 + 選択したバージョンのパッケージをインストールすることができます。 + つまり、指定のバージョンのパッケージをインストールするように選択する、 + ということです。 + 別の方法としては、ディストリビューションを特定するのに、 + パッケージ名に続けて、 + スラッシュとディストリビューションのバージョンやアーカイブ名 + (stable, testing, unstable) を記述できます。</para> + +<!-- + <para>Both of the version selection mechanisms can downgrade packages and must + be used with care.</para> +--> + <para>バージョン選択機構はダウングレード時にも使用できるため、 + 注意して使用しなければなりません。</para> + +<!-- + <para>Finally, the &apt-preferences; mechanism allows you to + create an alternative installation policy for + individual packages.</para> +--> + <para>最後に、&apt-preferences; 機構により、 + 特定のパッケージに対するインストールポリシーを作成できます。</para> + +<!-- + <para>If no package matches the given expression and the expression contains one + of '.', '?' or '*' then it is assumed to be a POSIX regular expression, + and it is applied + to all package names in the database. Any matches are then installed (or + removed). Note that matching is done by substring so 'lo.*' matches 'how-lo' + and 'lowest'. If this is undesired, anchor the regular expression + with a '^' or '$' character, or create a more specific regular expression.</para></listitem> +--> + <para>構文に '.', '?', '*' を含み、パッケージ名がマッチしなかった場合、 + POSIX 正規表現であると見なし、 + データベース内の全パッケージ名に対して適用します。 + マッチしたパッケージすべてがインストール(もしくは削除)されます。 + 'lo.*' のような文字列は、 + 'how-lo' や 'lowest' にマッチすることに注意してください。 + そうしたくなければ、'^' や '$' を付けるか、 + もっと詳しい正規表現を指定してください。</para></listitem> + </varlistentry> + + <varlistentry><term>remove</term> +<!-- + <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are + removed instead of installed. If a plus sign is appended to the package + name (with no intervening space), the identified package will be + installed instead of removed.</para></listitem> +--> + <listitem><para><literal>remove</literal> は、 + パッケージが削除されることを除き、<literal>install</literal> と同様です。 + プラス記号がパッケージ名に (間に空白を含まずに) 付加されると、 + 識別されたパッケージを、削除ではなくインストールします。</para></listitem> + </varlistentry> + + <varlistentry><term>source</term> +<!-- + <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT + will examine the available packages to decide which source package to + fetch. It will then find and download into the current directory the + newest available version of that source package. Source packages are + tracked separately from binary packages via <literal>deb-src</literal> type lines + in the &sources-list; file. This probably will mean that you will not + get the same source as the package you have installed or as you could + install. If the -\-compile options is specified then the package will be + compiled to a binary .deb using dpkg-buildpackage, if -\-download-only is + specified then the source package will not be unpacked.</para> +--> + <listitem><para><literal>source</literal> は、 + ソースパッケージを取得するのに <command>apt-get</command> します。 + APT はどのソースパッケージを取得するか決定するよう、 + 利用可能なパッケージを検討します。 + その後、最新の利用可能なソースパッケージを見つけ、 + カレントディレクトリへダウンロードします。 + バイナリパッケージとは別に &sources-list; ファイルの + <literal>deb-src</literal> 行から、ソースパッケージを追跡します。 + これは、インストールした (またはインストールできる) パッケージと、 + 取得元を変えることができることを示しています。 + --compile オプションが指定された場合、dpkg-buildpackage を用いて + バイナリ .deb ファイルへコンパイルを行います。 + --download-only の場合はソースパッケージを展開しません。</para> + +<!-- + <para>A specific source version can be retrieved by postfixing the source name + with an equals and then the version to fetch, similar to the mechanism + used for the package files. This enables exact matching of the source + package name and version, implicitly enabling the + <literal>APT::Get::Only-Source</literal> option.</para> +--> + <para>パッケージと同様に、 + ソース名の後ろにイコールと取得したいバージョンを置くと、 + 指定したバージョンのソースを取得できます。 + <literal>APT::Get::Only-Source</literal> + オプションが暗黙のうちに有効になっているため、 + ソースパッケージ名とバージョンに厳密に一致させています。</para> + +<!-- + <para>Note that source packages are not tracked like binary packages, they + exist only in the current directory and are similar to downloading source + tar balls.</para></listitem> +--> + <para>tar ball はカレントディレクトリにのみダウンロードされ、 + カレントディレクトリに展開されることに注意してください。</para></listitem> + </varlistentry> + + <varlistentry><term>build-dep</term> +<!-- + <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an + attempt to satisfy the build dependencies for a source package.</para></listitem> +--> + <listitem><para><literal>build-dep</literal> は、 + ソースパッケージの構築依存関係を満たすように、 + パッケージのインストール・削除を行います。</para></listitem> + </varlistentry> + + <varlistentry><term>check</term> +<!-- + <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks + for broken dependencies.</para></listitem> +--> + <listitem><para><literal>check</literal> は、 + パッケージキャッシュの更新や壊れた依存関係をチェックする診断ツールです。</para></listitem> + </varlistentry> + + <varlistentry><term>clean</term> +<!-- + <listitem><para><literal>clean</literal> clears out the local repository of retrieved package + files. It removes everything but the lock file from + <filename>&cachedir;/archives/</filename> and + <filename>&cachedir;/archives/partial/</filename>. When APT is used as a + &dselect; method, <literal>clean</literal> is run automatically. + Those who do not use dselect will likely want to run <literal>apt-get clean</literal> + from time to time to free up disk space.</para></listitem> +--> + <listitem><para><literal>clean</literal> は、 + 取得したパッケージのローカルリポジトリを掃除します。 + <filename>&cachedir;/archives/</filename> と + <filename>&cachedir;/archives/partial/</filename> + からロックファイル以外すべて削除します。 + APT が &dselect; から呼ばれるときには、 + 自動的に <literal>clean</literal> が実行されます。 + dselectを使用しない場合は、ディスクスペースを解放するため、時々 + <literal>apt-get clean</literal> を実行したくなるでしょう。</para></listitem> + </varlistentry> + + <varlistentry><term>autoclean</term> +<!-- + <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local + repository of retrieved package files. The difference is that it only + removes package files that can no longer be downloaded, and are largely + useless. This allows a cache to be maintained over a long period without + it growing out of control. The configuration option + <literal>APT::Clean-Installed</literal> will prevent installed packages from being + erased if it is set to off.</para></listitem> +--> + <listitem><para><literal>clean</literal> と同様に、 + <literal>autoclean</literal> は取得したパッケージのローカルリポジトリを掃除します。 + 違いは、もうダウンロードされることがないパッケージファイルや、 + ほとんど不要なパッケージファイルのみを削除することです。 + このため、長い期間、キャッシュが管理できずに肥大化することなく、 + 維持することができます。 + 設定オプション <literal>APT::Clean-Installed</literal> に + off をセットしていれば、 + インストール済のパッケージファイルが削除されるのを防げます。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term> +<!-- + <listitem><para>Download only; package files are only retrieved, not unpacked or installed. + Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem> +--> + <listitem><para>ダウンロードのみ - パッケージファイルの取得のみを行い、 + 展開・インストールを行いません。 + 設定項目 - <literal>APT::Get::Download-Only</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term> +<!-- + <listitem><para>Fix; attempt to correct a system with broken dependencies in + place. This option, when used with install/remove, can omit any packages + to permit APT to deduce a likely solution. Any Package that are specified + must completely correct the problem. The option is sometimes necessary when + running APT for the first time; APT itself does not allow broken package + dependencies to exist on a system. It is possible that a system's + dependency structure can be so corrupt as to require manual intervention + (which usually means using &dselect; or <command>dpkg -\-remove</command> to eliminate some of + the offending packages). Use of this option together with <option>-m</option> may produce an + error in some situations. + Configuration Item: <literal>APT::Get::Fix-Broken</literal>.</para></listitem> +--> + <listitem><para>修復 - 依存関係が壊れたシステムの修正を試みます。 + このオプションを install や remove と一緒に使うときは、 + パッケージを指定しなくてもかまいません。 + どのパッケージを指定しても、完全に問題を解決します。APT 自体は、 + システムに存在する壊れたパッケージ依存関係を許すことができないので、 + 初めて APT を実行する場合、このオプションが必要になることがあります。 + システムの依存関係構造にかなり問題がある場合は、 + 手動で修正するよう要求することもあります。 + (通常は、問題のあるパッケージを取り除くのに &dselect; や + <command>dpkg --remove</command> を使用します) + このオプションを <option>-m</option> オプションと同時に使用すると、 + エラーになる状況があるかもしれません。 + 設定項目 - <literal>APT::Get::Fix-Broken</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-m</option></term><term><option>--ignore-missing</option></term> + <term><option>--fix-missing</option></term> +<!-- + <listitem><para>Ignore missing packages; If packages cannot be retrieved or fail the + integrity check after retrieval (corrupted package files), hold back + those packages and handle the result. Use of this option together with + <option>-f</option> may produce an error in some situations. If a package is + selected for installation (particularly if it is mentioned on the + command line) and it could not be downloaded then it will be silently + held back. + Configuration Item: <literal>APT::Get::Fix-Missing</literal>.</para></listitem> +--> + <listitem><para>欠落パッケージの無視 - パッケージが取得できなかったり、 + (パッケージの破損で) 取得した後の整合性チェックを通らなかった場合、 + そのパッケージの処理を保留し最後まで処理を続けます。 + このオプションを <option>-f</option> オプションと同時に使用すると、 + エラーになる状況があるかもしれません。 + パッケージをインストールするよう選択している場合 + (特にコマンドラインでの操作時) や、 + ダウンロードできなかった場合に、なにも表示せず保留することになります。 + 設定項目 - <literal>APT::Get::Fix-Missing</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--no-download</option></term> +<!-- + <listitem><para>Disables downloading of packages. This is best used with + <option>-\-ignore-missing</option> to force APT to use only the .debs it has + already downloaded. + Configuration Item: <literal>APT::Get::Download</literal>.</para></listitem> +--> + <listitem><para>パッケージのダウンロードを無効にします。 + これはすでにダウンロードした .deb に対してのみ APT を行う場合に、 + <option>--ignore-missing</option> と併せて使うのがよいでしょう。 + 設定項目 - <literal>APT::Get::Download</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term> +<!-- + <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators. + More q's will produce more quiet up to a maximum of 2. You can also use + <option>-q=#</option> to set the quiet level, overriding the configuration file. + Note that quiet level 2 implies <option>-y</option>, you should never use -qq + without a no-action modifier such as -d, -\-print-uris or -s as APT may + decided to do something you did not expect. + Configuration Item: <literal>quiet</literal>.</para></listitem> +--> + <listitem><para>静粛 - 進捗表示を省略し、 + ログをとるのに便利な出力を行います。 + 最大 2 つまで q を重ねることでより静粛にできます。 + また、<option>-q=#</option> のように静粛レベルを指定して、 + 設定ファイルを上書きすることもできます。 + 静粛レベル 2 は <option>-y</option> を含んでいることに注意してください。 + APT が意図しない決定を行うかもしれないので -d, --print-uris, -s のような + 操作を行わないオプションをつけずに -qq を使用するべきではありません。 + 設定項目 - <literal>quiet</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-s</option></term> + <term><option>--simulate</option></term> + <term><option>--just-print</option></term> + <term><option>--dry-run</option></term> + <term><option>--recon</option></term> + <term><option>--no-act</option></term> +<!-- + <listitem><para>No action; perform a simulation of events that would occur but do not + actually change the system. + Configuration Item: <literal>APT::Get::Simulate</literal>.</para> +--> + <listitem><para>動作なし - なにが起こるのかのシミュレーションを行い、 + 実際にはシステムの変更を行いません。 + 設定項目 - <literal>APT::Get::Simulate</literal></para> + +<!-- + <para>Simulate prints out + a series of lines each one representing a dpkg operation, Configure (Conf), + Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with + and empty set of square brackets meaning breaks that are of no consequence + (rare).</para></listitem> +--> + <para>シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、 + 設定 (Conf)、削除 (Remv)、展開 (Inst) を表示します。 + 角カッコは壊れたパッケージを表し、(まれに) + 空の角カッコは大した問題ではないことを表します。</para></listitem> + </varlistentry> + + <varlistentry><term><option>-y</option></term><term><option>--yes</option></term> + <term><option>--assume-yes</option></term> +<!-- + <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run + non-interactively. If an undesirable situation, such as changing a held + package, trying to install a unauthenticated package or removing an essential package + occurs then <literal>apt-get</literal> will abort. + Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem> +--> + <listitem><para>プロンプトへの自動承諾 - すべてのプロンプトに自動的に + "yes" と答え、非対話的に実行します。 + 保留したパッケージの状態を変更したり、 + 必須パッケージを削除するような不適切な状況の場合、 + <literal>apt-get</literal> は処理を中断します。 + 設定項目 - <literal>APT::Get::Assume-Yes</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term> +<!-- + <listitem><para>Show upgraded packages; Print out a list of all packages that are to be + upgraded. + Configuration Item: <literal>APT::Get::Show-Upgraded</literal>.</para></listitem> +--> + <listitem><para>更新パッケージ表示 - + 更新される全パッケージを一覧表示します。 + 設定項目 - <literal>APT::Get::Show-Upgraded</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-V</option></term><term><option>--verbose-versions</option></term> +<!-- + <listitem><para>Show full versions for upgraded and installed packages. + Configuration Item: <literal>APT::Get::Show-Versions</literal>.</para></listitem> +--> + <listitem><para>更新・インストールするパッケージのヴァージョンを、 + すべて表示します。 + 設定項目 - <literal>APT::Get::Show-Versions</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>-b</option></term><term><option>--compile</option></term> + <term><option>--build</option></term> +<!-- + <listitem><para>Compile source packages after downloading them. + Configuration Item: <literal>APT::Get::Compile</literal>.</para></listitem> +--> + <listitem><para>ソースパッケージをダウンロード後、コンパイルします。 + 設定項目 - <literal>APT::Get::Compile</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--ignore-hold</option></term> +<!-- + <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold + placed on a package. This may be useful in conjunction with + <literal>dist-upgrade</literal> to override a large number of undesired holds. + Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem> +--> + <listitem><para>保留パッケージの無視 - パッケージの保留指示を無視して + <command>apt-get</command> を行います。 + <literal>dist-upgrade</literal> と共に、 + 大量のパッケージを保留の解除をするのに使用すると便利です。 + 設定項目 - <literal>APT::Ignore-Hold</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--no-upgrade</option></term> +<!-- + <listitem><para>Do not upgrade packages; When used in conjunction with <literal>install</literal>, + <literal>no-upgrade</literal> will prevent packages on the command line + from being upgraded if they are already installed. + Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem> +--> + <listitem><para>パッケージ更新なし - <literal>install</literal> + と同時に使用すると、<literal>no-upgrade</literal> は、 + 指定したパッケージがすでにインストールしてある場合に更新を行いません。 + 設定項目 - <literal>APT::Get::Upgrade</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--force-yes</option></term> +<!-- + <listitem><para>Force yes; This is a dangerous option that will cause apt to continue + without prompting if it is doing something potentially harmful. It + should not be used except in very special situations. Using + <literal>force-yes</literal> can potentially destroy your system! + Configuration Item: <literal>APT::Get::force-yes</literal>.</para></listitem> +--> + <listitem><para>強制承諾 - + APT が何か損傷を与えかねない動作をしようとした場合でも、 + 確認の入力なしで実行してしまう危険なオプションです。 + よほどの状況でなければ、使用しない方がいいでしょう。 + <literal>force-yes</literal> は、あなたのシステムを破壊しかねません! + 設定項目 - <literal>APT::Get::force-yes</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--print-uris</option></term> +<!-- + <listitem><para>Instead of fetching the files to install their URIs are printed. Each + URI will have the path, the destination file name, the size and the expected + md5 hash. Note that the file name to write to will not always match + the file name on the remote site! This also works with the + <literal>source</literal> and <literal>update</literal> commands. When used with the + <literal>update</literal> command the MD5 and size are not included, and it is + up to the user to decompress any compressed files. + Configuration Item: <literal>APT::Get::Print-URIs</literal>.</para></listitem> +--> + <listitem><para>インストールするファイルを取得する代わりに、 + その URI を表示します。 + URI には、パス、対象ファイル名、ファイルサイズ、 + 予測される md5 ハッシュが含まれています。 + 出力したファイル名が、 + 常にリモートサイトのファイル名と一致するわけではない、 + ということに注意してください! + これは <literal>source</literal> コマンド、 + <literal>update</literal> コマンドでも動作します。 + <literal>update</literal> で使用したときには、 + MD5 やファイルサイズを含みません。 + このとき、圧縮ファイルの展開はユーザの責任において行ってください。 + 設定項目 - <literal>APT::Get::Print-URIs</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--purge</option></term> +<!-- + <listitem><para>Use purge instead of remove for anything that would be removed. + An asterisk ("*") will be displayed next to packages which are + scheduled to be purged. + Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem> +--> + <listitem><para>削除する際、「削除」ではなく「完全削除」を行います。 + 「完全削除」を行うと指示したパッケージ名の後には、 + アスタリスク ("*") が付きます。 + 設定項目 - <literal>APT::Get::Purge</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--reinstall</option></term> +<!-- + <listitem><para>Re-Install packages that are already installed and at the newest version. + Configuration Item: <literal>APT::Get::ReInstall</literal>.</para></listitem> +--> + <listitem><para>すでに最新版がインストールされていても、 + パッケージを再インストールします。 + 設定項目 - <literal>APT::Get::ReInstall</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><option>--list-cleanup</option></term> +<!-- + <listitem><para>This option defaults to on, use <literal>-\-no-list-cleanup</literal> to turn it + off. When on <command>apt-get</command> will automatically manage the contents of + <filename>&statedir;/lists</filename> to ensure that obsolete files are erased. + The only reason to turn it off is if you frequently change your source + list. + Configuration Item: <literal>APT::Get::List-Cleanup</literal>.</para></listitem> +--> + <listitem><para>この機能はデフォルトで ON になっています。 + OFF にするには <literal>--no-list-cleanup</literal> としてください。 + ON の場合、 + <command>apt-get</command> は古くなったファイルを確実に消去するため、 + 自動的に <filename>&statedir;/lists</filename> の中身を管理します。 + これを OFF にするのは、取得元リストを頻繁に変更する時ぐらいでしょう。 + 設定項目 - <literal>APT::Get::List-Cleanup</literal>.</para></listitem> + </varlistentry> + + <varlistentry><term><option>-t</option></term> + <term><option>--target-release</option></term> + <term><option>--default-release</option></term> +<!-- + <listitem><para>This option controls the default input to the policy engine, it creates + a default pin at priority 990 using the specified release string. The + preferences file may further override this setting. In short, this option + lets you have simple control over which distribution packages will be + retrieved from. Some common examples might be + <option>-t '2.1*'</option> or <option>-t unstable</option>. + Configuration Item: <literal>APT::Default-Release</literal>; + see also the &apt-preferences; manual page.</para></listitem> +--> + <listitem><para>このオプションは、 + ポリシーエンジンへのデフォルト入力を制御します。 + これは、指定されたリリース文字列を使用し、 + デフォルト pin を優先度 990 で作成することです。 + 優先ファイルはこの設定を上書きします。 + 要するにこのオプションで、 + どの配布パッケージを取得するかを簡単に管理します。 + 一般的な例としては、 + <option>-t '2.1*'</option> や <option>-t unstable</option> でしょう。 + 設定項目 - <literal>APT::Default-Release</literal> + &apt-preferences; のマニュアルページもご覧ください。</para></listitem> + </varlistentry> + + <varlistentry><term><option>--trivial-only</option></term> +<!-- + <listitem><para> + Only perform operations that are 'trivial'. Logically this can be considered + related to <option>-\-assume-yes</option>, where <option>-\-assume-yes</option> will answer + yes to any prompt, <option>-\-trivial-only</option> will answer no. + Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem> +--> + <listitem><para> + 「重要でない」操作のみを行います。 + これは論理的に <option>--assume-yes</option> の仲間と見なせます。 + <option>--assume-yes</option> は質問にすべて yes と答えますが、 + <option>--trivial-only</option> はすべて no と答えます。 + 設定項目 - <literal>APT::Get::Trivial-Only</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--no-remove</option></term> +<!-- + <listitem><para>If any packages are to be removed apt-get immediately aborts without + prompting. + Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem> +--> + <listitem><para>パッケージが削除される状況になったとき、 + プロンプトを表示せず中断します。 + 設定項目 - <literal>APT::Get::Remove</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--only-source</option></term> + <!-- + <listitem><para>Only has meaning for the + <literal>source</literal> and <literal>build-dep</literal> + commands. Indicates that the given source names are not to be + mapped through the binary table. This means that if this option + is specified, these commands will only accept source package + names as arguments, rather than accepting binary package names + and looking up the corresponding source package. Configuration + Item: <literal>APT::Get::Only-Source</literal>.</para></listitem> +--> + <listitem><para><literal>source</literal> コマンドと + <literal>build-dep</literal> コマンドでのみ意味があります。 + 指定されたソース名がバイナリテーブルにマップされないようにします。 + これは、このオプションを指定すると、 + バイナリパッケージ名を受け付けて対応するソースパッケージを探すのではなく、 + 引数にソースパッケージ名しか受け付けなくなる、ということです。 + 設定項目 - <literal>APT::Get::Only-Source</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term> +<!-- + <listitem><para>Download only the diff or tar file of a source archive. + Configuration Item: <literal>APT::Get::Diff-Only</literal> and + <literal>APT::Get::Tar-Only</literal>.</para></listitem> +--> + <listitem><para>ソースアーカイブの diff ファイルや + tar ファイルのダウンロードのみを行います。 + 設定項目 - <literal>APT::Get::Diff-Only</literal>, + <literal>APT::Get::Tar-Only</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--arch-only</option></term> +<!-- + <listitem><para>Only process architecture-dependent build-dependencies. + Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem> +--> + <listitem><para>構築依存関係の解決を、 + アーキテクチャに依存したもののみ行います。 + 設定項目 - <literal>APT::Get::Arch-Only</literal></para></listitem> + </varlistentry> + + <varlistentry><term><option>--allow-unauthenticated</option></term> +<!-- + <listitem><para>Ignore if packages can't be authenticated and don't prompt about it. + This is usefull for tools like pbuilder. + Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem> +--> + <listitem><para>パッケージを確認できない場合に無視し、 + それについて質問しません。 + pbuilder のようなツールで便利です。 + 設定項目 - <literal>APT::Get::AllowUnauthenticated</literal></para></listitem> + </varlistentry> + + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>Files</title> +--> + <refsect1><title>ファイル</title> + <variablelist> + <varlistentry><term><filename>/etc/apt/sources.list</filename></term> +<!-- + <listitem><para>Locations to fetch packages from. + Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem> +--> + <listitem><para>パッケージの取得元。 + 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/apt.conf</filename></term> +<!-- + <listitem><para>APT configuration file. + Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem> +--> + <listitem><para>APT 設定ファイル。 + 設定項目 - <literal>Dir::Etc::Main</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term> +<!-- + <listitem><para>APT configuration file fragments + Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem> +--> + <listitem><para>APT 設定ファイルの断片。 + 設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/preferences</filename></term> +<!-- + <listitem><para>Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem> +--> + <listitem><para>バージョン優先ファイル。 + ここに "pin" の設定を行います。 + つまり、別々の取得元や異なるディストリビューションのバージョンの、 + どこからパッケージを取得するかを設定します。 + 設定項目 - <literal>Dir::Etc::Preferences</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>&cachedir;/archives/</filename></term> +<!-- + <listitem><para>Storage area for retrieved package files. + Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem> +--> + <listitem><para>取得済みパッケージファイル格納エリア。 + 設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term> +<!-- + <listitem><para>Storage area for package files in transit. + Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem> +--> + <listitem><para>取得中パッケージファイル格納エリア。 + 設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)</para></listitem> + </varlistentry> + + <varlistentry><term><filename>&statedir;/lists/</filename></term> +<!-- + <listitem><para>Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem> +--> + <listitem><para>&sources-list; のパッケージリソース特有の状態情報格納エリア。 + 設定項目 - <literal>Dir::State::Lists</literal></para></listitem> + </varlistentry> + + <varlistentry><term><filename>&statedir;/lists/partial/</filename></term> +<!-- + <listitem><para> Storage area for state information in transit. + Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem> +--> + <listitem><para>取得中の状態情報格納エリア。 + 設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> +<!-- + <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, + &apt-conf;, &apt-config;, + The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para> +--> + <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, + &apt-conf;, &apt-config;, + &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto</para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> +<!-- + <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para> +--> + <para><command>apt-get</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。</para> + </refsect1> + + &manbugs; + &translator; + +</refentry> diff --git a/doc/ja/apt-key.ja.8.xml b/doc/ja/apt-key.ja.8.xml new file mode 100644 index 000000000..732ca9b1c --- /dev/null +++ b/doc/ja/apt-key.ja.8.xml @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + &apt-docinfo; + + <refmeta> + <refentrytitle>apt-key</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-key</refname> +<!-- + <refpurpose>APT key management utility</refpurpose> +--> + <refpurpose>APT キー管理ユーティリティ</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-key</command> + <arg><replaceable>command</replaceable>/</arg> + <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> + <para> +<!-- + <command>apt-key</command> is used to manage the list of keys used + by apt to authenticate packages. Packages which have been + authenticated using these keys will be considered trusted. +--> + <command>apt-key</command> は、 + apt が パッケージを認証するのに使用するキーの一覧を管理するのに使用します。 + このキーで認証されたパッケージは、信頼するに足ると見なせるでしょう。 + </para> +</refsect1> + +<!-- +<refsect1><title>Commands</title> +--> +<refsect1><title>コマンド</title> + <variablelist> + <varlistentry><term>add <replaceable>filename</replaceable></term> + <listitem> + <para> + +<!-- + Add a new key to the list of trusted keys. The key is read + from <replaceable>filename</replaceable>, or standard input if + <replaceable>filename</replaceable> is <literal>-</literal>. +--> + 信頼キー一覧に新しいキーを追加します。 + このキーは <replaceable>filename</replaceable> から読み込みますが、 + <replaceable>filename</replaceable> を <literal>-</literal> とすると、 + 標準入力から読み込みます。 + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>del <replaceable>keyid</replaceable></term> + <listitem> + <para> + +<!-- + Remove a key from the list of trusted keys. +--> + 信頼キー一覧からキーを削除します。 + + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>list</term> + <listitem> + <para> + +<!-- + List trusted keys. +--> + 信頼キーを一覧表示します。 + + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>update</term> + <listitem> + <para> + +<!-- + Update the local keyring with the keyring of Debian archive + keys and removes from the keyring the archive keys which are no + longer valid. +--> + Debian アーカイブキーで、ローカルキーリングを更新し、 + もう有効でないキーをキーリングから削除します。 + + </para> + + </listitem> + </varlistentry> + </variablelist> +</refsect1> + +<!-- + <refsect1><title>Files</title> +--> + <refsect1><title>ファイル</title> + <variablelist> + <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term> +<!-- + <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem> +--> + <listitem><para>ローカル信頼キーのキーリング。 + 新しいキーはここに追加されます。</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term> +<!-- + <listitem><para>Local trust database of archive keys.</para></listitem> +--> + <listitem><para>アーカイブキーのローカル信頼データベース</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term> +<!-- + <listitem><para>Keyring of Debian archive trusted keys.</para></listitem> +--> + <listitem><para>Debian アーカイブ信頼キーのキーリング</para></listitem> + </varlistentry> + + <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term> +<!-- + <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem> +--> + <listitem><para>削除された Debian アーカイブ信頼キーのキーリング</para></listitem> + </varlistentry> + + + + </variablelist> + +</refsect1> + +<!-- +<refsect1><title>See Also</title> +--> +<refsect1><title>関連項目</title> +<para> +&apt-get;, &apt-secure; +</para> +</refsect1> + + &manbugs; + &manauthor; + &translator; + +</refentry> + diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml new file mode 100644 index 000000000..5b9612a7f --- /dev/null +++ b/doc/ja/apt-secure.ja.8.xml @@ -0,0 +1,374 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + &apt-docinfo; + + <refmeta> + <refentrytitle>apt-secure</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + +<!-- NOTE: This manpage has been written based on the + Securing Debian Manual ("Debian Security + Infrastructure" chapter) and on documentation + available at the following sites: + http://wiki.debian.net/?apt06 + http://www.syntaxpolice.org/apt-secure/ + http://www.enyo.de/fw/software/apt-secure/ +--> +<!-- TODO: write a more verbose example of how it works with + a sample similar to + http://www.debian-administration.org/articles/174 + ? +--> + + + <!-- Man page title --> + <refnamediv> + <refname>apt-secure</refname> +<!-- + <refpurpose>Archive authentication support for APT</refpurpose> +--> + <refpurpose>APT アーカイブ認証サポート</refpurpose> + </refnamediv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> + <para> +<!-- + Starting with version 0.6, <command>apt</command> contains code + that does signature checking of the Release file for all + archives. This ensures that packages in the archive can't be + modified by people who have no access to the Release file signing + key. +--> + バージョン 0.6 より、<command>apt</command> 全アーカイブに対する + Release ファイルの署名チェックコードが含まれています。 + Release ファイル署名キーにアクセスできない人が、 + アーカイブのパッケージの変更が確実にできないようにします。 + </para> + + <para> +<!-- + If a package comes from a archive without a signature or with a + signature that apt does not have a key for that package is + considered untrusted and installing it will result in a big + warning. <command>apt-get</command> will currently only warn + for unsigned archives, future releases might force all sources + to be verified before downloading packages from them. +--> + パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、 + アーカイブから来たパッケージは、信頼されていないと見なし、 + インストールの際に重要な警告が表示されます。 + <command>apt-get</command> は、 + 現在未署名のパッケージに対して警告するだけですが、 + 将来のリリースでは、全ソースに対し、 + パッケージダウンロード前に強制的に検証される可能性があります。 + </para> + + <para> +<!-- + The package frontends &apt-get;, &aptitude; and &synaptic; support this new + authentication feature. +--> + &apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、 + この新認証機能をサポートしています。 + </para> +</refsect1> + +<!-- + <refsect1><title>Trusted archives</title> +--> + <refsect1><title>信頼済アーカイブ</title> + + <para> +<!-- + The chain of trust from an apt archive to the end user is made up of + different steps. <command>apt-secure</command> is the last step in + this chain, trusting an archive does not mean that the packages + that you trust it do not contain malicious code but means that you + trust the archive maintainer. Its the archive maintainer + responsibility to ensure that the archive integrity is correct. +--> + apt アーカイブからエンドユーザまでの信頼の輪は、 + いくつかのステップで構成されています。 + <command>apt-secure</command> は、この輪の最後のステップで、 + アーカイブを信頼することは、 + パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、 + アーカイブメンテナを信頼すると言うことです。 + これは、アーカイブの完全性を保証するのは、 + アーカイブメンテナの責任だということです。 + </para> + +<!-- + <para>apt-secure does not review signatures at a + package level. If you require tools to do this you should look at + <command>debsig-verify</command> and + <command>debsign</command> (provided in the debsig-verify and + devscripts packages respectively).</para> +--> + <para>apt-secure はパッケージレベルの署名検証は行いません。 + そのようなツールが必要な場合は、 + <command>debsig-verify</command> や <command>debsign</command> + (debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています) + を確認してください。</para> + + <para> +<!-- + The chain of trust in Debian starts when a maintainer uploads a new + package or a new version of a package to the Debian archive. This + upload in order to become effective needs to be signed by a key of + a maintainer within the Debian maintainer's keyring (available in + the debian-keyring package). Maintainer's keys are signed by + other maintainers following pre-established procedures to + ensure the identity of the key holder. +--> + Debian における信頼の輪は、 + 新しいパッケージやパッケージの新しいバージョンを、 + メンテナが Debian アーカイブにアップロードすることで始まります。 + これは、Debian メンテナキーリング (debian-keyring パッケージにあります) + にあるメンテナのキーで署名しなければ、アップロードできないということです。 + メンテナのキーは、キーの所有者のアイデンティティを確保するため、 + 以下のような事前に確立した手段で、他のメンテナに署名されています。 + </para> + + <para> +<!-- + Once the uploaded package is verified and included in the archive, + the maintainer signature is stripped off, an MD5 sum of the package + is computed and put in the Packages file. The MD5 sum of all of the + packages files are then computed and put into the Release file. The + Release file is then signed by the archive key (which is created + once a year and distributed through the FTP server. This key is + also on the Debian keyring. +--> + アップロードされたパッケージごとに、検証してアーカイブに格納します。 + パッケージは、メンテナの署名をはがされ、 MD5 sum を計算されて、 + Packages ファイルに格納されます。 + その後、全パッケージファイルの MD5 sum を計算してから、 + Release ファイルに置きます。 + Release ファイルは、アーカイブキーで署名されます。 + アーカイブキーは年ごとに作成され、FTP サーバで配布されます。 + このキーも Debian キーリングに含まれます。 + </para> + + <para> +<!-- + Any end user can check the signature of the Release file, extract the MD5 + sum of a package from it and compare it with the MD5 sum of the + package he downloaded. Prior to version 0.6 only the MD5 sum of the + downloaded Debian package was checked. Now both the MD5 sum and the + signature of the Release file are checked. +--> + エンドユーザは誰でも、Release ファイルの署名をチェックし、 + パッケージの MD5 sum を抽出して、ダウンロードしたパッケージの MD5 sum + と比較できます。 + バージョン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、 + チェックしていませんでした。 + 現在では、MD5 sum と Release ファイルの署名の両方でチェックします。 + </para> + +<!-- + <para>Notice that this is distinct from checking signatures on a + per package basis. It is designed to prevent two possible attacks: +--> + <para>以上は、パッケージごとの署名チェックとは違うことに注意してください。 + 以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。 + </para> + + <itemizedlist> +<!-- + <listitem><para><literal>Network "man in the middle" + attacks</literal>. Without signature checking, a malicious + agent can introduce himself in the package download process and + provide malicious software either by controlling a network + element (router, switch, etc.) or by redirecting traffic to a + rogue server (through arp or DNS spoofing + attacks).</para></listitem> +--> + <listitem><para><literal>ネットワーク中間者攻撃</literal> + 署名をチェックしないと、 + 悪意あるエージェントがパッケージダウンロードプロセスに割り込んだり、 + ネットワーク構成要素 (ルータ、スイッチなど) の制御や、 + 悪漢サーバへのネットワークトラフィックのリダイレクトなど + (arp 経由や DNS スプーフィング攻撃) で、 + 悪意あるソフトウェアを掴まされたりします。</para></listitem> + +<!-- + <listitem><para><literal>Mirror network compromise</literal>. + Without signature checking, a malicious agent can compromise a + mirror host and modify the files in it to propagate malicious + software to all users downloading packages from that + host.</para></listitem> +--> + <listitem><para><literal>ミラーネットワーク感染</literal>. + 署名をチェックしないと、悪意あるエージェントがミラーホストに感染し、 + このホストからダウンロードしたユーザすべてに、 + 悪意あるソフトウェアが伝播するようにファイルを変更できます。</para></listitem> + </itemizedlist> + +<!-- + <para>However, it does not defend against a compromise of the + Debian master server itself (which signs the packages) or against a + compromise of the key used to sign the Release files. In any case, + this mechanism can complement a per-package signature.</para> +--> + <para>しかしこれは、 + (パッケージに署名する) Debian マスターサーバ自体の感染や、 + Release ファイルに署名するのに使用したキーの感染を防げません。 + いずれにせよ、この機構はパッケージごとの署名を補完することができます。</para> +</refsect1> + +<!-- + <refsect1><title>User configuration</title> +--> + <refsect1><title>ユーザの設定</title> + <para> +<!-- + <command>apt-key</command> is the program that manages the list + of keys used by apt. It can be used to add or remove keys although + an installation of this release will automatically provide the + default Debian archive signing keys used in the Debian package + repositories. +--> + <command>apt-key</command> は、 + apt が使用するキーリストを管理するプログラムです。 + このリリースのインストールでは、Debian パッケージリポジトリで使用する、 + キーで署名するデフォルトの Debian アーカイブを提供しますが、 + <command>apt-key</command> でキーの追加・削除が行えます。 + </para> + <para> +<!-- + In order to add a new key you need to first download it + (you should make sure you are using a trusted communication channel + when retrieving it), add it with <command>apt-key</command> and + then run <command>apt-get update</command> so that apt can download + and verify the <filename>Release.gpg</filename> files from the archives you + have configured. +--> + 新しいキーを追加するためには、まずキーをダウンロードする必要があります。 + (取得する際には、信頼できる通信チャネルを使用するよう、特に留意してください) + 取得したキーを、<command>apt-key</command> で追加し、 + <command>apt-get update</command> を実行してください。 + 以上により、apt は指定したアーカイブから、<filename>Release.gpg</filename> + ファイルをダウンロード・検証できるようになります。 + </para> +</refsect1> + +<!-- +<refsect1><title>Archive configuration</title> +--> +<refsect1><title>アーカイブの設定</title> + <para> +<!-- + If you want to provide archive signatures in an archive under your + maintenance you have to: +--> + あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、 + 以下のようにしてください。 + </para> + + <itemizedlist> +<!-- + <listitem><para><literal>Create a toplevel Release + file</literal>. if it does not exist already. You can do this + by running <command>apt-ftparchive release</command> + (provided inftp apt-utils).</para></listitem> +--> + <listitem><para><literal>上位 Release ファイルの作成</literal> + 既にこれが存在しているのでなければ、 + <command>apt-ftparchive release</command> (apt-utils で提供) + を実行して作成してください。</para></listitem> + +<!-- + <listitem><para><literal>Sign it</literal>. You can do this by running + <command>gpg -abs -o Release.gpg Release</command>.</para></listitem> +--> + <listitem><para><literal>署名</literal> + <command>gpg -abs -o Release.gpg Release</command> を実行して、 + 署名してください。</para></listitem> + +<!-- + <listitem><para><literal>Publish the key fingerprint</literal>, + that way your users will know what key they need to import in + order to authenticate the files in the + archive.</para></listitem> +--> + <listitem><para><literal>キーの指紋を配布</literal> + これにより、アーカイブ内のファイル認証に、 + どのキーをインポートする必要があるかを、 + ユーザに知らせることになります。</para></listitem> + + </itemizedlist> + +<!-- + <para>Whenever the contents of the archive changes (new packages + are added or removed) the archive maintainer has to follow the + first two steps previously outlined.</para> +--> + <para>アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、 + アーカイブメンテナは前述の最初の 1, 2 ステップに従わなければなりません。</para> + +</refsect1> + +<!-- +<refsect1><title>See Also</title> +--> +<refsect1><title>関連項目</title> +<para> +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&debsign; &debsig-verify;, &gpg; +</para> + +<!-- +<para>For more backgound information you might want to review the +<ulink +url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian +Security Infrastructure</ulink> chapter of the Securing Debian Manual +(available also in the harden-doc package) and the +<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html" +>Strong Distribution HOWTO</ulink> by V. Alex Brennen. </para> +--> +<para>詳細な背景情報を検証するのなら、 +the Securing Debian Manual (harden-doc パッケージにもあります) の +<ulink +url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian +Security Infrastructure</ulink> 章と、 +V. Alex Brennen による +<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html" +>Strong Distribution HOWTO</ulink> をご覧ください。</para> + +</refsect1> + + &manbugs; + &manauthor; + +<!-- +<refsect1><title>Manpage Authors</title> +--> +<refsect1><title>マニュアルページ筆者</title> + +<!-- +<para>This man-page is based on the work of Javier Fernández-Sanguino +Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt. +--> +<para>このマニュアルページは Javier Fernández-Sanguino +Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt +の作業を元にしています。 +</para> + +</refsect1> + + &translator; + +</refentry> + diff --git a/doc/ja/apt-sortpkgs.ja.1.xml b/doc/ja/apt-sortpkgs.ja.1.xml new file mode 100644 index 000000000..779620f0b --- /dev/null +++ b/doc/ja/apt-sortpkgs.ja.1.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt-sortpkgs</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-sortpkgs</refname> +<!-- + <refpurpose>Utility to sort package index files</refpurpose> +--> + <refpurpose>パッケージインデックスファイルのソートユーティリティ</refpurpose> + + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-sortpkgs</command> + <arg><option>-hvs</option></arg> + <arg><option>-o=<replaceable>config string</replaceable></option></arg> + <arg><option>-c=<replaceable>file</replaceable></option></arg> + <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><command>apt-sortpkgs</command> will take an index file (Source index or Package + index) and sort the records so that they are ordered by the package name. + It will also sort the internal fields of each record according to the + internal sorting rules.</para> +--> + <para><command>apt-sortpkgs</command> は、インデックスファイル + (ソースインデックスやパッケージインデックス) からレコードをソートし、 + パッケージ名順に整えます。 + また、内部のソート規則に従って、内部フィールドについてもソートを行います。</para> + +<!-- + <para> + All output is sent to stdout, the input must be a seekable file.</para> +--> + <para> + 出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。</para> + </refsect1> + +<!-- + <refsect1><title>options</title> +--> + <refsect1><title>オプション</title> + &apt-cmdblurb; + + <variablelist> + <varlistentry><term><option>-s</option></term><term><option>--source</option></term> + <listitem><para> +<!-- + Use Source index field ordering. + Configuration Item: <literal>APT::SortPkgs::Source</literal>.</para></listitem> +--> + ソースインデックスフィールド順に並べ替え + 設定項目 - <literal>APT::SortPkgs::Source</literal>.</para></listitem> + </varlistentry> + + &apt-commonoptions; + + </variablelist> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-conf;</para> + </refsect1> + +<!-- + <refsect1><title>Diagnostics</title> +--> + <refsect1><title>診断メッセージ</title> + <para><command>apt-sortpkgs</command> は正常終了時に 0 を返します。 + エラー時には十進の 100 を返します。</para> + </refsect1> + + &manbugs; + &translator; + +</refentry> diff --git a/doc/ja/apt.conf.ja.5.sgml b/doc/ja/apt.conf.ja.5.sgml deleted file mode 100644 index 3634096f9..000000000 --- a/doc/ja/apt.conf.ja.5.sgml +++ /dev/null @@ -1,785 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!-- translation of version 1.9 --> -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ - -<!ENTITY % aptent SYSTEM "apt.ent.ja"> -%aptent; - -]> - -<refentry lang=ja> - &apt-docinfo; - - <refmeta> - <refentrytitle>apt.conf</> - <manvolnum>5</> - </refmeta> - - <!-- Man page title --> - <refnamediv> - <refname>apt.conf</> -<!-- - <refpurpose>Configuration file for APT</> ---> - <refpurpose>APT ե</> - </refnamediv> - -<!-- - <RefSect1><Title>Description</> ---> - <RefSect1><Title></> - <para> -<!-- - <filename/apt.conf/ is the main configuration file for the APT suite of - tools, all tools make use of the configuration file and a common command line - parser to provide a uniform environment. When an APT tool starts up it will - read the configuration specified by the <envar/APT_CONFIG/ environment - variable (if any) and then read the files in <literal/Dir::Etc::Parts/ - then read the main configuration file specified by - <literal/Dir::Etc::main/ then finally apply the - command line options to override the configuration directives, possibly - loading even more config files. ---> - <filename/apt.conf/ ϡAPT ġ뽸μեǤ - եȶ̤Υޥɥ饤ѡȤäơ - ٤ƤΥġĶǻѤǤޤ - APT ġεưˤϡ<envar/APT_CONFIG/ Ķѿ˻ꤷ - (¸ߤ) ɤ߹ߤޤ - <literal/Dir::Etc::Parts/ Υեɤ߹ߤޤ - θ <literal/Dir::Etc::main/ ǻꤷեɤ߹ߡ - Ǹ˥ޥɥ饤ץǡեͤޤ - <para> -<!-- - The configuration file is organized in a tree with options organized into - functional groups. Option specification is given with a double colon - notation, for instance <literal/APT::Get::Assume-Yes/ is an option within - the APT tool group, for the Get tool. Options do not inherit from their - parent groups. ---> - եϡǽ롼פȤ˷ΩƤ줿ץ - ڹ¤ɽޤ - ץƤϡ2 ĤΥǶڤޤ - 㤨 <literal/APT::Get::Assume-Yes/ ϡAPT ġ륰롼פΡGet ġ - ץǤץϡƥ롼פѾޤ - <para> -<!-- - Syntacticly the configuration language is modeled after what the ISC tools - such as bind and dhcp use. Each line is of the form - <literallayout>APT::Get::Assume-Yes "true";</literallayout> The trailing - semicolon is required and the quotes are optional. A new scope can be - opened with curly braces, like: ---> - ʸˡϡbind dhcp Τ褦 ISC ġǥˤƤޤ - ιԤ⡢<literallayout>APT::Get::Assume-Yes "true";</literallayout> - 褦ʷǡߥǶڤޤޤѤϥץǤ - ʲΤ褦楫åȤȡפȤǤޤ -<informalexample><programlisting> -APT { - Get { - Assume-Yes "true"; - Fix-Broken "true"; - }; -}; -</programlisting></informalexample> -<!-- - with newlines placed to make it more readable. Lists can be created by - opening a scope and including a single word enclosed in quotes followed by a - semicolon. Multiple entries can be included, each seperated by a semicolon. ---> - ޤŬԤ뤳Ȥǡɤߤ䤹ʤޤ - ꥹȤϡסȤǰϤޤ줿ñ졢 - ƥߥ³뤳ȤǺǤޤ - ߥǶڤ뤳ȤǡʣΥȥɽȤǤޤ -<informalexample><programlisting> -DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; -</programlisting></informalexample> - <para> -<!-- - In general the sample configuration file in - <filename>&docdir;/examples/apt.conf</> &configureindex; - is a good guide for how it should look. ---> - <filename>&docdir;/examples/apt.conf</> &configureindex; - ŪեΥץǤɤΤ褦ꤹ뤫ͤˤʤǤ礦 - <para> -<!-- - Two specials are allowed, <literal/#include/ and <literal/#clear/. - <literal/#include/ will include the given file, unless the filename - ends in a slash, then the whole directory is included. - <literal/#clear/ is used to erase a list of names. ---> - <literal/#include/ <literal/#clear/ 2 Ĥ̤ʵˡޤ - <literal/#include/ ϻꤷեߤޤ - ե̾åǽäˤϡΥǥ쥯ȥ٤ - ߤޤ - <literal/#clear/ ̾ΥꥹȤΤǤ - <para> -<!-- - All of the APT tools take a -o option which allows an arbitary configuration - directive to be specified on the command line. The syntax is a full option - name (<literal/APT::Get::Assume-Yes/ for instance) followed by an equals - sign then the new value of the option. Lists can be appended too by adding - a trailing :: to the list name. ---> - ٤Ƥ APT ġǡޥɥ饤ǤդԤ - -o ץѤǤޤ - ʸˡϡʥץ̾ (㡢<literal/APT::Get::Assume-Yes/) - 桢³ƥץοͤȤʤޤ - ꥹ̾³::ä뤳ȤǡꥹȤɲä뤳ȤǤޤ - <!-- arbitary = Ǥդ (ܤäƤʤäޤʼߤ) --> - </RefSect1> - -<!-- - <RefSect1><Title>The APT Group</> ---> - <RefSect1><Title>APT 롼</> - <para> -<!-- - This group of options controls general APT behavior as well as holding the - options for all of the tools. ---> - Υץ롼פϡġΤ˱ƶΤ롢Ū APT ο - 椷ޤ - <VariableList> - <VarListEntry><Term>Architecture</Term> - <ListItem><Para> -<!-- - System Architecture; sets the architecture to use when fetching files and - parsing package lists. The internal default is the architecture apt was - compiled for. ---> - ƥॢƥ - եꡢѥåꥹȤ - ϤȤ˻Ѥ륢ƥåȤޤ - ǤΥǥեȤϡapt ѥ뤷ƥǤ - </VarListEntry> - - <VarListEntry><Term>Ignore-Hold</Term> - <ListItem><Para> -<!-- - Ignore Held packages; This global option causes the problem resolver to - ignore held packages in its decision making. ---> - αѥå̵ - ΥХ륪ץϡα - ꤷѥå̵뤷ޤ - <!-- problem resolver ǤΤ --> - </VarListEntry> - - <VarListEntry><Term>Clean-Installed</Term> - <ListItem><Para> -<!-- - Defaults to on. When turned on the autoclean feature will remove any pacakges - which can no longer be downloaded from the cache. If turned off then - packages that are locally installed are also excluded from cleaning - but - note that APT provides no direct means to reinstall them. ---> - ȡѤߥѥåκ - - ǥեȤͭǤautoclean ǽ on λ - Ǥʤʤäѥåå夫ޤ - off ξϡ˥ȡ뤵Ƥѥåϡ - оݤ鳰ޤ - ) APT ϡå夫ѥåκƥȡˡ - ľܤˤޤ - </VarListEntry> - - <VarListEntry><Term>Immediate-Configure</Term> - <ListItem><Para> -<!-- - Disable Immedate Configuration; This dangerous option disables some - of APT's ordering code to cause it to make fewer dpkg calls. Doing - so may be necessary on some extremely slow single user systems but - is very dangerous and may cause package install scripts to fail or worse. - Use at your own risk. ---> - ¨̵ - δʥץϡAPT ᥳɤ̵ˤơ - dpkg θƤӽФۤȤɤʤ褦ˤޤ - ϡ٤桼ƥǤɬפ⤷ޤ - ˴ǡѥåΥȡ륹ץȤԤꡢ - ⤷ϤäȰȤ뤫⤷ޤ - ǤǻѤƤ - <!-- Immedate Immediate typo? --> - </VarListEntry> - - <VarListEntry><Term>Force-LoopBreak</Term> - <ListItem><Para> -<!-- - Never Enable this option unless you -really- know what you are doing. It - permits APT to temporarily remove an essential package to break a - Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential - packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option - will work if the essential packages are not tar, gzip, libc, dpkg, bash or - anything that those packages depend on. ---> - 褦ȤƤΤˡȽäƤΤǤʤС - ФˤΥץͭˤʤǤ - Բķ (essential) ѥåδ֤ǡ (Conflicts)/ (Conflicts) - (Conflicts)/ ɬ (Pre-Depend) Υ롼פȤˡ - ԲķѥåŪ˺ơ롼פȴǽˤޤ - <emphasis>ʥ롼פϤʤϤǡ - ȤнʥХǤ</emphasis> - Υץϡtar, gzip, libc, dpkg, bash Ȥ餬¸Ƥ - ѥåʳԲķѥåưޤ - </VarListEntry> - - <VarListEntry><Term>Cache-Limit</Term> - <ListItem><Para> -<!-- - APT uses a fixed size memory mapped cache file to store the 'available' - information. This sets the size of that cache. ---> - APT ϡѲǽǼ뤿ˡꥵ - ޥåץåեѤޤ - ΥץϡΥå奵ꤷޤ - </VarListEntry> - - <VarListEntry><Term>Build-Essential</Term> - <ListItem><Para> -<!-- - Defines which package(s) are considered essential build dependencies. ---> - ۰¸طԲķʥѥåޤ - </VarListEntry> - - <VarListEntry><Term>Get</Term> - <ListItem><Para> -<!-- - The Get subsection controls the &apt-get; tool, please see its - documentation for more information about the options here. ---> - ֥ Get &apt-get; ġ椷ޤ - Υץξܺ٤ &apt-get; ʸȤƤ - </VarListEntry> - - <VarListEntry><Term>Cache</Term> - <ListItem><Para> -<!-- - The Cache subsection controls the &apt-cache; tool, please see its - documentation for more information about the options here. ---> - ֥ Cache &apt-cache; ġ椷ޤ - Υץξܺ٤ &apt-cache; ʸȤƤ - </VarListEntry> - - <VarListEntry><Term>CDROM</Term> - <ListItem><Para> -<!-- - The CDROM subsection controls the &apt-cdrom; tool, please see its - documentation for more information about the options here. ---> - ֥ CDROM &apt-cdrom; ġ椷ޤ - Υץξܺ٤ &apt-cdrom; ʸȤƤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>The Acquire Group</> ---> - <RefSect1><Title>Acquire 롼</> - <para> -<!-- - The <literal/Acquire/ group of options controls the download of packages - and the URI handlers. ---> - <literal/Acquire/ ץ롼פϡѥåΥɤ - URI ϥɥԤޤ - <VariableList> - <VarListEntry><Term>Queue-Mode</Term> - <ListItem><Para> -<!-- - Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or - <literal/access/ which determines how APT parallelizes outgoing - connections. <literal/host/ means that one connection per target host - will be opened, <literal/access/ means that one connection per URI type - will be opened. ---> - 塼⡼ - <literal/Queue-Mode/ APTɤΤ褦³Ԥ - <literal/host/ <literal/access/ ǻǤޤ - <literal/host/ ϡåȥۥȤȤ 1 ³ޤ - <literal/access/ ϡURI פȤ 1 ³ޤ - </VarListEntry> - - <VarListEntry><Term>Retries</Term> - <ListItem><Para> -<!-- - Number of retries to perform. If this is non-zero APT will retry failed - files the given number of times. ---> - ȥ饤βꤷޤ0 Ǥʤ硢APT ϼԤեФơ - Ϳ줿ȥ饤Ԥޤ - </VarListEntry> - - <VarListEntry><Term>Source-Symlinks</Term> - <ListItem><Para> -<!-- - Use symlinks for source archives. If set to true then source archives will - be symlinked when possible instead of copying. True is the default ---> - ֤ΥܥåѤޤ - true åȤƤȤǽʤ饳ԡ˥ܥå - ĥޤtrue ǥեȤǤ - </VarListEntry> - - <VarListEntry><Term>http</Term> - <ListItem><Para> -<!-- - HTTP URIs; http::Proxy is the default http proxy to use. It is in the - standard form of <literal>http://[[user][:pass]@]host[:port]/</>. Per - host proxies can also be specified by using the form - <literal/http::Proxy::<host>/ with the special keyword <literal/DIRECT/ - meaning to use no proxies. The <envar/http_proxy/ environment variable - will override all settings. ---> - HTTP URI - http::Proxy ϡǥեȤǻѤ http ץǤ - <literal>http://[[user][:pass]@]host[:port]/</>Ȥɸɽޤ - ۥȤȤΥץξϡ<literal/http::Proxy::<host>/ Ȥ - ȡץѤʤȤ̣ü쥭 <literal/DIRECT/ - Ѥƻꤹ뤳ȤǤޤ - ٤ƤϡĶѿ <envar/http_proxy/ Ǿޤ - <para> -<!-- - Three settings are provided for cache control with HTTP/1.1 complient - proxy caches. <literal/No-Cache/ tells the proxy to not use its cached - response under any circumstances, <literal/Max-Age/ is sent only for - index files and tells the cache to refresh its object if it is older than - the given number of seconds. Debian updates its index files daily so the - default is 1 day. <literal/No-Store/ specifies that the cache should never - store this request, it is only set for archive files. This may be useful - to prevent polluting a proxy cache with very large .deb files. Note: - Squid 2.0.2 does not support any of these options. ---> - HTTP/1.1 ΥץåˤĤơ3 ꤬ޤ - <literal/No-Cache/ ϥץФơʤ⥭åѤʤ - ޤ - <literal/Max-Age/ ϡǥåեѤΤȤ - 줿֤Ťäˡ֥Ȥեå夹褦 - å˻ؼޤ - ǥեȤǤ 1 ȤʤäƤ뤿ᡢDebian ˤΥǥå - եޤ - <literal/No-Store/ ϡå夬ΥꥯȤǼ - ֥եΤꤹ褦ꤷޤ - ϡ礭.debեǥץå夬Τ - ɤΤ⤷ޤ - ) Squid 2.0.2 ǤϡΥץݡȤƤޤ - <para> -<!-- - The option <literal/timeout/ sets the timeout timer used by the method, - this applies to all things including connection timeout and data timeout. ---> - <literal/timeout/ ץϡˡǤΥॢȤޤǤλ֤ - ꤷޤ - ˤϡ³ΥॢȤȥǡΥॢȤޤޤƤޤ - <para> -<!-- - One setting is provided to control the pipeline depth in cases where the - remote server is not RFC conforming or buggy (such as Squid 2.0.2) - <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5 - indicating how many outstanding requests APT should send. A value of - zero MUST be specified if the remote host does not properly linger - on TCP connections - otherwise data corruption will occur. Hosts which - require this are in violation of RFC 2068. ---> - ⡼ȥФ RFC Ǥʤäꡢ(Squid 2.0.2 Τ褦) Х - äꤷȤΤˡѥץ饤οꤷޤ - <literal/Acquire::http::Pipeline-Depth/ ˤꡢAPT Ǥ - ꥯȤβ 0 5 ͤǤޤ - ⡼ȥФŬڤǤʤTCP ³˻֤Ȥϡ - <emphasis>ɬ</emphasis>0ͤꤷʤФʤޤ - ǤʤСǡ»Ƥޤޤ - 줬ɬפʥۥȤϡRFC 2068 ˰ȿƤޤ - </VarListEntry> - - <VarListEntry><Term>ftp</Term> - <ListItem><Para> -<!-- - FTP URIs; ftp::Proxy is the default proxy server to use. It is in the - standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is - overriden by the <envar/ftp_proxy/ environment variable. To use a ftp - proxy you will have to set the <literal/ftp::ProxyLogin/ script in the - configuration file. This entry specifies the commands to send to tell - the proxy server what to connect to. Please see - &configureindex; for an example of - how to do this. The subsitution variables available are - <literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, <literal/$(SITE_USER)/, - <literal/$(SITE_PASS)/, <literal/$(SITE)/, and <literal/$(SITE_PORT)/. - Each is taken from it's respective URI component. ---> - FTP URI - ftp::Proxy ϡǥեȤǻѤץФǤ - <literal>ftp://[[user][:pass]@]host[:port]/</> Ȥɸɽޤ - Ķѿ <envar/ftp_proxy/ Ǿޤ - ftp ץѤˤϡե <literal/ftp::ProxyLogin/ - ץȤꤹɬפޤ - ץФ³ޥɤΥȥꤷޤ - ɤΤ褦ˤΤ &configureindex; ȤƤ - ¾ˤ⡢<literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, - <literal/$(SITE_USER)/, <literal/$(SITE_PASS)/, <literal/$(SITE)/, - <literal/$(SITE_PORT)/ ѲǽǤ - ⡢줾 URI ȡǤ - <para> -<!-- - The option <literal/timeout/ sets the timeout timer used by the method, - this applies to all things including connection timeout and data timeout. ---> - <literal/timeout/ ץϡˡǤΥॢȤޤǤλ֤ - ꤷޤ - ˤϡ³ΥॢȤȥǡΥॢȤޤޤƤޤ - <para> -<!-- - Several settings are provided to control passive mode. Generally it is - safe to leave passive mode on, it works in nearly every environment. - However some situations require that passive mode be disabled and port - mode ftp used instead. This can be done globally, for connections that - go through a proxy or for a specific host (See the sample config file - for examples) ---> - ΤĤϡѥå֥⡼ɤ椹ΤǤ - Ūˡѥå֥⡼ɤΤޤޤˤƤǡ - ۤܤɤʴĶǤưޤ - Ǥϡѥå֥⡼ɤ̵Τᡢ - ˥ݡȥ⡼ ftp Ѥɬפޤ - ϡץ̤³ΥۥȤؤ³̤ͭǤ - (ϥץեȤƤ) - <para> -<!-- - It is possible to proxy FTP over HTTP by setting the <envar/ftp_proxy/ - environment variable to a http url - see the discussion of the http method - above for syntax. You cannot set this in the configuration file and it is - not recommended to use FTP over HTTP due to its low efficiency. ---> - Ķѿ <envar/ftp_proxy/ http url ˤ FTP over HTTP Υץ - ѲǽˤʤޤʸˡϾ http ˤĤƤȤƤ - եǤåȤ뤳ȤϤǤޤ - ޤΨ FTP over HTTP ѤΤϿ侩ޤ - <para> -<!-- - The setting <literal/ForceExtended/ controls the use of RFC2428 - <literal/EPSV/ and <literal/EPRT/ commands. The defaut is false, which means - these commands are only used if the control connection is IPv6. Setting this - to true forces their use even on IPv4 connections. Note that most FTP servers - do not support RFC2428. ---> - <literal/ForceExtended/ RFC2428 <literal/EPSV/ - <literal/EPRT/ ޥɤλѤ椷ޤ - ǥեȤǤ false Ǥϡȥ륳ͥ IPv6 - λˤΤߡΥޥɤѤȤȤǤ - true ˥åȤȡIPv4 ͥǤŪˡ - ΥޥɤѤޤ - ) ۤȤɤ FTP Ф RFC2428 ݡȤƤޤ - </VarListEntry> - - <VarListEntry><Term>cdrom</Term> - <ListItem><Para> -<!-- - CDROM URIs; the only setting for CDROM URIs is the mount point, - <literal/cdrom::Mount/ which must be the mount point for the CDROM drive - as specified in <filename>/etc/fstab</>. It is possible to provide - alternate mount and unmount commands if your mount point cannot be listed - in the fstab (such as an SMB mount and old mount packages). The syntax - is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within - the cdrom block. It is important to have the trailing slash. Unmount - commands can be specified using UMount. ---> - CDROM URI - ޥȥݥȤΤߤԤޤ - <filename>/etc/fstab</> ꤵƤ褦ˡCDROM ɥ饤֤ - ޥȥݥȤ <literal/cdrom::Mount/ ꤷʤФʤޤ - (SMB ޥȤŤ mount ѥåʤ) ޥȥݥȤ fstab - ҤǤʤ硢˥ޥȡޥȥޥɤѤǤޤ - ʸˡϡcdrom ֥å - <literallayout>"/cdrom/"::Mount "foo";</literallayout> ηǵҤޤ - åˤĤΤϽפǤ - ޥȥޥɤ UMount ǻꤹ뤳ȤǤޤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>Directories</> ---> - <RefSect1><Title>ǥ쥯ȥ</> - <para> -<!-- - The <literal/Dir::State/ section has directories that pertain to local - state information. <literal/lists/ is the directory to place downloaded - package lists in and <literal/status/ is the name of the dpkg status file. - <literal/preferences/ is the name of the APT preferences file. - <literal/Dir::State/ contains the default directory to prefix on all sub - items if they do not start with <filename>/</> or <filename>./</>. ---> - <literal/Dir::State/ ϡ־˴ؤǥ쥯ȥ - ݻޤ - <literal/lists/ ϡɤѥåǼǥ쥯ȥǡ - <literal/status/ dpkg ξ֥ե̾ɽޤ - <literal/preferences/ APT ե̾Ǥ - <literal/Dir::State/ ˤϡ<filename>/</> <filename>./</>ǻϤޤʤ - ֥ƥղä롢ǥեȥǥ쥯ȥޤǤޤ - <para> -<!-- - <literal/Dir::Cache/ contains locations pertaining to local cache - information, such as the two package caches <literal/srcpkgcache/ and - <literal/pkgcache/ as well as the location to place downloaded archives, - <literal/Dir::Cache::archives/. Generation of caches can be turned off - by setting their names to be blank. This will slow down startup but - save disk space. It is probably prefered to turn off the pkgcache rather - than the srcpkgcache. Like <literal/Dir::State/ the default - directory is contained in <literal/Dir::Cache/ ---> - <literal/Dir::Cache/ ϥ륭å˴ؤǼƤޤ - ϡɺѥ֤ξ <literal/Dir::Cache::archives/ - Ʊ͡<literal/srcpkgcache/ <literal/pkgcache/ Υѥåå - Ȥʤޤ - 줾˥åȤ뤳Ȥǡå̵ˤǤޤ - ϵư٤ʤޤǥڡˤʤޤ - 餯srcpkgcache pkgcache ̵ˤ뤳Ȥ - ¿Ȼפޤ - <literal/Dir::State/ Ʊ͡<literal/Dir::Cache/ - ǥեȥǥ쥯ȥޤǤޤ - <para> -<!-- - <literal/Dir::Etc/ contains the location of configuration files, - <literal/sourcelist/ gives the location of the sourcelist and - <literal/main/ is the default configuration file (setting has no effect, - unless it is done from the config file specified by - <envar/APT_CONFIG/). ---> - <literal/Dir::Etc/ եξǼƤޤ - <literal/sourcelist/ ϥꥹȤξ - <literal/main/ ϥǥեȤեǤ - (<envar/APT_CONFIG/ եꤵ줿Τߡ - θ̤ޤ) - <para> -<!-- - The <literal/Dir::Parts/ setting reads in all the config fragments in - lexical order from the directory specified. After this is done then the - main config file is loaded. ---> - <literal/Dir::Parts/ ϡꤵ줿ǥ쥯ȥ꤫顢 - ñ̤ƤҤɤߤߤޤ - ꤷˡᥤեɤޤ - <para> -<!-- - Binary programs are pointed to by <literal/Dir::Bin/. <literal/methods/ - specifies the location of the method handlers and <literal/gzip/, - <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/, - <literal/dpkg-buildpackage/ and <literal/apt-cache/ specify the location - of the respective programs. ---> - Хʥץ <literal/Dir::Bin/ ǻꤷޤ - <literal/methods/ ϥåɥϥɥξꤷ - <literal/gzip/, <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/, - <literal/dpkg-buildpackage/, <literal/apt-cache/ Ϥ줾 - ץξꤷޤ - </RefSect1> - -<!-- - <RefSect1><Title>APT in DSelect</> ---> - <RefSect1><Title>DSelect Ǥ APT</> - <para> -<!-- - When APT is used as a &dselect; method several configuration directives - control the default behaviour. These are in the <literal/DSelect/ section. ---> - &dselect; APT Ѥݡ<literal/DSelect/ ʲ - ܤǡǥեȤư椷ޤ - <VariableList> - <VarListEntry><Term>Clean</Term> - <ListItem><Para> -<!-- - Cache Clean mode; this value may be one of always, prompt, auto, - pre-auto and never. always and prompt will remove all packages from - the cache after upgrading, prompt (the default) does so conditionally. - auto removes only those packages which are no longer downloadable - (replaced with a new version for instance). pre-auto performs this - action before downloading new packages. ---> - å奯⡼ - ͤ always, prompt, auto, pre-auto never - ΤҤȤĤޤ - always prompt Ϲ塢ѥåå夫ޤ - (ǥեȤ) prompt ǤϾդǺޤ - auto ϥǽѥå (㤨пС֤줿) - ޤ - pre-auto Ϥưѥåɤľ˹Ԥޤ - </VarListEntry> - - <VarListEntry><Term>Options</Term> - <ListItem><Para> -<!-- - The contents of this variable is passed to &apt-get; as command line - options when it is run for the install phase. ---> - ѿƤϡinstall Υޥɥ饤ץƱͤˡ - &apt-get; Ϥޤ - </VarListEntry> - - <VarListEntry><Term>UpdateOptions</Term> - <ListItem><Para> -<!-- - The contents of this variable is passed to &apt-get; as command line - options when it is run for the update phase. ---> - ѿƤϡupdate Υޥɥ饤ץƱͤˡ - &apt-get; Ϥޤ - </VarListEntry> - - <VarListEntry><Term>PromptAfterUpdate</Term> - <ListItem><Para> -<!-- - If true the [U]pdate operation in &dselect; will always prompt to continue. - The default is to prompt only on error. ---> - True ξ硢&dselect; [U]pdate ¹Իˡ³ԤΤΥץץȤ - ɽޤǥեȤϥ顼ȯΤߤǤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>How APT calls dpkg</> ---> - <RefSect1><Title>APT dpkg Ƥˡ</> - <para> -<!-- - Several configuration directives control how APT invokes &dpkg;. These are - in the <literal/DPkg/ section. ---> - ܤ APT ɤΤ褦 &dpkg; ƤӽФǤޤ - <literal/DPkg/ ˤޤ - <VariableList> - <VarListEntry><Term>Options</Term> - <ListItem><Para> -<!-- - This is a list of options to pass to dpkg. The options must be specified - using the list notation and each list item is passed as a single argument - to &dpkg;. ---> - dpkg ϤץΥꥹȤǤ - ץϡꥹȵˡѤƻꤷʤФʤޤ - ޤƥꥹȤñΰȤ &dpkg; Ϥޤ - </VarListEntry> - - <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term> - <ListItem><Para> -<!-- - This is a list of shell commands to run before/after invoking &dpkg;. - Like <literal/Options/ this must be specified in list notation. The - commands are invoked in order using <filename>/bin/sh</>, should any - fail APT will abort. ---> - &dpkg; ƤӽФǼ¹Ԥ륷륳ޥɤΥꥹȤǤ - <literal/Options/ Τ褦ˡꥹȵˡǻꤷʤФʤޤ - ޥɤ <filename>/bin/sh</> ѤƸƤӽФ졢 - ꤬СAPT ϰ۾ｪλޤ - </VarListEntry> - - <VarListEntry><Term>Pre-Install-Pkgs</Term> - <ListItem><Para> -<!-- - This is a list of shell commands to run before invoking dpkg. Like - <literal/Options/ this must be specified in list notation. The commands - are invoked in order using <filename>/bin/sh</>, should any fail APT - will abort. APT will pass to the commands on standard input the - filenames of all .deb files it is going to install, one per line. ---> - &dpkg; ƤӽФ˼¹Ԥ륷륳ޥɤΥꥹȤǤ - <literal/Options/ Τ褦ˡꥹȵˡǻꤷʤФʤޤ - ޥɤ <filename>/bin/sh</> ѤƸƤӽФ졢 - ꤬СAPT ϰ۾ｪλޤ - APT ϥȡ뤷褦Ȥ .deb եΥե̾ - ҤȤĤĥޥɤɸϤޤ - <para> -<!-- - Version 2 of this protocol dumps more information, including the - protocol version, the APT configuration space and the packages, files - and versions being changed. Version 2 is enabled by setting - <literal/DPkg::Tools::Options::cmd::Version/ to 2. <literal/cmd/ is a - command given to <literal/Pre-Install-Pkgs/. ---> - ΥץȥΥС 2 Ǥϡ(ץȥΥС - APT ꥹڡѥåޤ) ܺپե롢 - ѹƤСϤޤ - <literal/DPkg::Tools::Options::cmd::Version/ 2 åȤȡ - С 2 ͭˤǤޤ - <literal/cmd/ <literal/Pre-Install-Pkgs/ Ϳ륳ޥɤǤ - </VarListEntry> - - <VarListEntry><Term>Run-Directory</Term> - <ListItem><Para> -<!-- - APT chdirs to this directory before invoking dpkg, the default is - <filename>/</>. ---> - APT dpkg ƤӽФˤΥǥ쥯ȥ˰ưޤ - ǥեȤ <filename>/</> Ǥ - </VarListEntry> - - <VarListEntry><Term>Build-Options</Term> - <ListItem><Para> -<!-- - These options are passed to &dpkg-buildpackage; when compiling packages, - the default is to disable signing and produce all binaries. ---> - ΥץϡѥåΥѥ &dpkg-buildpackage; - Ϥޤ - ǥեȤǤϡ̵̾ˤХʥޤ - </VarListEntry> - </VariableList> - </RefSect1> - -<!-- - <RefSect1><Title>Debug Options</> ---> - <RefSect1><Title>ǥХåץ</> - <para> -<!-- - Most of the options in the <literal/debug/ section are not interesting to - the normal user, however <literal/Debug::pkgProblemResolver/ shows - interesting output about the decisions dist-upgrade makes. - <literal/Debug::NoLocking/ disables file locking so APT can do some - operations as non-root and <literal/Debug::pkgDPkgPM/ will print out the - command line for each dpkg invokation. <literal/Debug::IdentCdrom/ will - disable the inclusion of statfs data in CDROM IDs. ---> - <literal/debug/ ¿Υץϡ̤Υ桼ˤȤäƶ̣ΤǤ - ޤ<literal/Debug::pkgProblemResolver/ ǡ - dist-upgrade ȽǤˤĤƤζ̣Ϥޤ - <literal/Debug::NoLocking/ ϡAPT root Ǥ褦 - եΥå̵ˤޤ <literal/Debug::pkgDPkgPM/ ϡ - dpkg ƤֺݤΥޥɥ饤Ϥޤ - <literal/Debug::IdentCdrom/ ϡCDROM ID ξ֥ǡޤ̵ˤޤ - <!-- statfs status typo? --> - </RefSect1> - -<!-- - <RefSect1><Title>Examples</> ---> - <RefSect1><Title></> - <para> -<!-- - &configureindex; contains a - sample configuration file showing the default values for all possible - options. ---> - &configureindex; ˡѲǽץΥǥեͤȤǤ롢 - եΥץ뤬ޤ - </RefSect1> - -<!-- - <RefSect1><Title>Files</> ---> - <RefSect1><Title>ե</> - <para> - <filename>/etc/apt/apt.conf</> - </RefSect1> - -<!-- - <RefSect1><Title>See Also</> ---> - <RefSect1><Title></> - <para> - &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;. - </RefSect1> - - &manbugs; - &manauthor; - &translator; - -</refentry> diff --git a/doc/ja/apt.conf.ja.5.xml b/doc/ja/apt.conf.ja.5.xml new file mode 100644 index 000000000..8707c801e --- /dev/null +++ b/doc/ja/apt.conf.ja.5.xml @@ -0,0 +1,809 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt.conf</refentrytitle> + <manvolnum>5</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt.conf</refname> +<!-- + <refpurpose>Configuration file for APT</refpurpose> +--> + <refpurpose>APT 設定ファイル</refpurpose> + </refnamediv> + +<!-- + <refsect1><title>Description</title> +--> + <refsect1><title>説明</title> +<!-- + <para><filename>apt.conf</filename> is the main configuration file for the APT suite of + tools, all tools make use of the configuration file and a common command line + parser to provide a uniform environment. When an APT tool starts up it will + read the configuration specified by the <envar>APT_CONFIG</envar> environment + variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal> + then read the main configuration file specified by + <literal>Dir::Etc::main</literal> then finally apply the + command line options to override the configuration directives, possibly + loading even more config files.</para> +--> + <para><filename>apt.conf</filename> は、 + APT ツール集のメイン設定ファイルです。 + この設定ファイルと共通のコマンドラインパーサを使って、 + すべてのツールを統一環境で使用できます。 + APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指定した設定を + (存在すれば) 読み込みます。 + 次に <literal>Dir::Etc::Parts</literal> のファイルを読み込みます。 + 次に <literal>Dir::Etc::main</literal> で指定した主設定ファイルを読み込み、 + 最後にコマンドラインオプションで、 + 設定ファイルより取得した値を上書きします。</para> + +<!-- + <para>The configuration file is organized in a tree with options organized into + functional groups. option specification is given with a double colon + notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within + the APT tool group, for the Get tool. options do not inherit from their + parent groups.</para> +--> + <para>設定ファイルは、 + 機能グループごとに系統立てられたオプションを木構造で表します。 + オプションの内容は、2 つのコロンで区切ります。 + 例えば <literal>APT::Get::Assume-Yes</literal> は、 + APT ツールグループの、Get ツール用オプションです。 + オプションは、親グループから継承しません。</para> + +<!-- + <para>Syntacticly the configuration language is modeled after what the ISC tools + such as bind and dhcp use. Lines starting with + <literal>//</literal> are treated as comments (ignored). + Each line is of the form + <literal>APT::Get::Assume-Yes "true";</literal> The trailing + semicolon is required and the quotes are optional. A new scope can be + opened with curly braces, like:</para> + --> + <para>設定言語の文法は、 + bind や dhcp のような ISC ツールをモデルにしています。 + <literal>//</literal> で始まる行はコメントとして扱われます (無視)。 + いずれの行も、<literallayout>APT::Get::Assume-Yes "true";</literallayout> の + ような形式です。 + 行末のセミコロンは必要ですが、ダブルクォートは使わなくてもかまいません。 + 以下のように中カッコを使うと、新しいスコープを開くことができます。</para> + +<informalexample><programlisting> +APT { + Get { + Assume-Yes "true"; + Fix-Broken "true"; + }; +}; +</programlisting></informalexample> + +<!-- + <para>with newlines placed to make it more readable. Lists can be created by + opening a scope and including a single word enclosed in quotes followed by a + semicolon. Multiple entries can be included, each separated by a semicolon.</para> +--> + <para>また適宜改行することで、より読みやすくなります。 + リストは、開いたスコープ、クォートで囲まれた単語、 + そしてセミコロンと続けることで作成できます。 + セミコロンで区切ることで、複数のエントリを表すことができます。</para> + +<informalexample><programlisting> +DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; +</programlisting></informalexample> + +<!-- + <para>In general the sample configuration file in + <filename>&docdir;examples/apt.conf</filename> &configureindex; + is a good guide for how it should look.</para> +--> + <para><filename>&docdir;examples/apt.conf</filename> &configureindex; + は一般的な設定ファイルのサンプルです。 + どのように設定するか参考になるでしょう。</para> + +<!-- + <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal> + <literal>#include</literal> will include the given file, unless the filename + ends in a slash, then the whole directory is included. + <literal>#clear</literal> is used to erase a list of names.</para> +--> + <para><literal>#include</literal> と <literal>#clear</literal> の + 2 つの特別な記法があります。 + <literal>#include</literal> は指定したファイルを取り込みます。 + ファイル名がスラッシュで終わった場合には、 + そのディレクトリをすべて取り込みます。 + <literal>#clear</literal> は名前のリストを削除するのに便利です。</para> + +<!-- + <para>All of the APT tools take a -o option which allows an arbitrary configuration + directive to be specified on the command line. The syntax is a full option + name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals + sign then the new value of the option. Lists can be appended too by adding + a trailing :: to the list name.</para> +--> + <para>すべての APT ツールで、 + コマンドラインで任意の設定を行う -o オプションが使用できます。 + 文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</literal>)、 + 等号、続いてオプションの新しい値となります。 + リスト名に続き::を加えることで、リストを追加することができます。</para> + </refsect1> + +<!-- + <refsect1><title>The APT Group</title> +--> + <refsect1><title>APT グループ</title> +<!-- + <para>This group of options controls general APT behavior as well as holding the + options for all of the tools.</para> +--> + <para>このオプショングループは、ツール全体に影響のある、 + 一般的な APT の振る舞いを制御します。</para> + + <variablelist> + <varlistentry><term>Architecture</term> +<!-- + <listitem><para>System Architecture; sets the architecture to use when fetching files and + parsing package lists. The internal default is the architecture apt was + compiled for.</para></listitem> +--> + <listitem><para>システムアーキテクチャ - ファイルを取得したり、 + パッケージリストを解析するときに使用するアーキテクチャをセットします。 + 内部でのデフォルトは、 + apt をコンパイルしたアーキテクチャです。</para></listitem> + </varlistentry> + + <varlistentry><term>Ignore-Hold</term> +<!-- + <listitem><para>Ignore Held packages; This global option causes the problem resolver to + ignore held packages in its decision making.</para></listitem> +--> + <listitem><para>保留パッケージの無視 - このグローバルオプションは、 + 問題解決器に保留と指定したパッケージを無視します。</para></listitem> + </varlistentry> + + <varlistentry><term>Clean-Installed</term> +<!-- + <listitem><para>Defaults to on. When turned on the autoclean feature will remove any packages + which can no longer be downloaded from the cache. If turned off then + packages that are locally installed are also excluded from cleaning - but + note that APT provides no direct means to reinstall them.</para></listitem> +--> + <listitem><para>デフォルトで有効です。autoclean 機能が on の時、 + ダウンロードできなくなったパッケージをキャッシュから削除します。 + off の場合、ローカルにインストールされているパッケージは、 + 削除対象から外します。 + しかし、 APT はキャッシュから削除したパッケージの再インストール方法を、 + 直接提供するわけではないことに注意してください。</para></listitem> + </varlistentry> + + <varlistentry><term>Immediate-Configure</term> +<!-- + <listitem><para>Disable Immediate Configuration; This dangerous option disables some + of APT's ordering code to cause it to make fewer dpkg calls. Doing + so may be necessary on some extremely slow single user systems but + is very dangerous and may cause package install scripts to fail or worse. + Use at your own risk.</para></listitem> +--> + <listitem><para>即時設定無効 - この危険なオプションは、 + APT の要求コードを無効にして dpkg の呼び出しをほとんどしないようにします。 + これは、非常に遅いシングルユーザシステムでは必要かもしれませんが、 + 非常に危険で、パッケージのインストールスクリプトが失敗したり、 + もしくはもっと悪いことがおきるかもしれません。 + 自己責任で使用してください。</para></listitem> + </varlistentry> + + <varlistentry><term>Force-LoopBreak</term> +<!-- + <listitem><para>Never Enable this option unless you -really- know what you are doing. It + permits APT to temporarily remove an essential package to break a + Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential + packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option + will work if the essential packages are not tar, gzip, libc, dpkg, bash or + anything that those packages depend on.</para></listitem> +--> + <listitem><para>何をしようとしているのか「本当に」判っているのでなければ、 + 絶対にこのオプションを有効にしないでください。 + 不可欠 (essential) パッケージ同士で、 + 競合 (Conflicts) /競合や競合/事前依存 (Pre-Depend) + のループに落ち込んだときに、 + 不可欠パッケージを一時的に削除してループを抜けられるようにします。 + <emphasis>そんなループはあり得ないはずで、 + あるとすれば重大なバグです。</emphasis> + このオプションは、tar, gzip, libc, dpkg, bash とそれらが依存している + パッケージ以外の不可欠パッケージで動作します。</para></listitem> + </varlistentry> + + <varlistentry><term>Cache-Limit</term> +<!-- + <listitem><para>APT uses a fixed size memory mapped cache file to store the 'available' + information. This sets the size of that cache (in bytes).</para></listitem> +--> + <listitem><para>APT は「利用可能」情報を格納するために、 + 固定サイズのメモリマップキャッシュファイルを使用します。 + このオプションは、そのキャッシュサイズを指定します。</para></listitem> + </varlistentry> + + <varlistentry><term>Build-Essential</term> +<!-- + <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem> +--> + <listitem><para>構築依存関係で不可欠なパッケージを定義します。</para></listitem> + </varlistentry> + + <varlistentry><term>Get</term> +<!-- + <listitem><para>The Get subsection controls the &apt-get; tool, please see its + documentation for more information about the options here.</para></listitem> +--> + <listitem><para>サブセクション Get は &apt-get; ツールを制御します。 + このオプションの詳細は &apt-get; の文書を参照してください。</para></listitem> + </varlistentry> + + <varlistentry><term>Cache</term> +<!-- + <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its + documentation for more information about the options here.</para></listitem> +--> + <listitem><para>サブセクション Cache は &apt-cache; ツールを制御します。 + このオプションの詳細は &apt-cache; の文書を参照してください。</para></listitem> + </varlistentry> + + <varlistentry><term>CDROM</term> +<!-- + <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its + documentation for more information about the options here.</para></listitem> +--> + <listitem><para>サブセクション CDROM は &apt-cdrom; ツールを制御します。 + このオプションの詳細は &apt-cdrom; の文書を参照してください。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>The Acquire Group</title> +--> + <refsect1><title>Acquire グループ</title> +<!-- + <para>The <literal>Acquire</literal> group of options controls the download of packages + and the URI handlers. +--> + <para><literal>Acquire</literal> オプショングループは、 + パッケージのダウンロードや URI ハンドラの制御を行います。 + <variablelist> + <varlistentry><term>Queue-Mode</term> +<!-- + <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or + <literal>access</literal> which determines how APT parallelizes outgoing + connections. <literal>host</literal> means that one connection per target host + will be opened, <literal>access</literal> means that one connection per URI type + will be opened.</para></listitem> +--> + <listitem><para>キューモード - <literal>Queue-Mode</literal> は、 + APT がどのように並列接続を行うか、 + <literal>host</literal> か <literal>access</literal> で指定できます。 + <literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。 + <literal>access</literal> は、 + URI タイプごとに 1 接続を開きます。</para></listitem> + </varlistentry> + + <varlistentry><term>Retries</term> +<!-- + <listitem><para>Number of retries to perform. If this is non-zero APT will retry failed + files the given number of times.</para></listitem> +--> + <listitem><para>リトライの回数を設定します。 + 0 でない場合、APT は失敗したファイルに対して、 + 与えられた回数だけリトライを行います。</para></listitem> + </varlistentry> + + <varlistentry><term>Source-Symlinks</term> +<!-- + <listitem><para>Use symlinks for source archives. If set to true then source archives will + be symlinked when possible instead of copying. True is the default.</para></listitem> +--> + <listitem><para>ソースアーカイブのシンボリックリンクを使用します。 + true がセットされているとき、可能ならコピーの代わりにシンボリックリンクが + 張られます。true がデフォルトです。</para></listitem> + </varlistentry> + + <varlistentry><term>http</term> +<!-- + <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the + standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per + host proxies can also be specified by using the form + <literal>http::Proxy::<host></literal> with the special keyword <literal>DIRECT</literal> + meaning to use no proxies. The <envar>http_proxy</envar> environment variable + will override all settings.</para> +--> + <listitem><para>HTTP URI - http::Proxy は、 + デフォルトで使用する http プロキシです。 + <literal>http://[[user][:pass]@]host[:port]/</literal> + という標準形で表します。ホストごとのプロキシの場合は、 + <literal>http::Proxy::<host></literal> という形と、 + プロキシを使用しないという意味の特殊キーワード <literal>DIRECT</literal> + を使用して指定することもできます。すべての設定は、 + 環境変数 <envar>http_proxy</envar> で上書きされます。</para> + +<!-- + <para>Three settings are provided for cache control with HTTP/1.1 compliant + proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached + response under any circumstances, <literal>Max-Age</literal> is sent only for + index files and tells the cache to refresh its object if it is older than + the given number of seconds. Debian updates its index files daily so the + default is 1 day. <literal>No-Store</literal> specifies that the cache should never + store this request, it is only set for archive files. This may be useful + to prevent polluting a proxy cache with very large .deb files. Note: + Squid 2.0.2 does not support any of these options.</para> +--> + <para>HTTP/1.1 準拠のプロキシキャッシュの制御について、 + 3 種類の設定があります。<literal>No-Cache</literal> はプロキシに対して、 + いかなる時もキャッシュを使用しないと伝えます。 + <literal>Max-Age</literal> は、インデックスファイル用のときだけ送信し、 + 得られた時間よりも古かった場合に、 + オブジェクトをリフレッシュするようキャッシュに指示します。 + デフォルトでは 1 日となっているため、 + Debian は日毎にそのインデックスファイルを更新します。 + <literal>No-Store</literal> は、キャッシュがこのリクエストを格納せず、 + アーカイブファイルのみ設定するよう指定します。 + これは、非常に大きな .deb ファイルでプロキシキャッシュが汚れるのを、 + 防ぐのに便利かもしれません。 + 注) Squid 2.0.2 では、これらのオプションをサポートしていません。</para> + +<!-- + <para>The option <literal>timeout</literal> sets the timeout timer used by the method, + this applies to all things including connection timeout and data timeout.</para> +--> + <para><literal>timeout</literal> オプションは、 + この方法でのタイムアウトまでの時間を設定します。 + これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para> + +<!-- + <para>One setting is provided to control the pipeline depth in cases where the + remote server is not RFC conforming or buggy (such as Squid 2.0.2) + <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 + indicating how many outstanding requests APT should send. A value of + zero MUST be specified if the remote host does not properly linger + on TCP connections - otherwise data corruption will occur. Hosts which + require this are in violation of RFC 2068.</para></listitem> +--> + <para>リモートサーバが RFC 準拠でなかったり、 + (Squid 2.0.2 のように) バグがあったりしたときのために、 + パイプラインの深さの制御を設定します。 + <literal>Acquire::http::Pipeline-Depth</literal> により、 + APT が送信できるリクエストの回数を 0 から 5 の値で設定できます。 + リモートサーバが適切でなく、TCP 接続に時間がかかるときは、 + <emphasis>必ず</emphasis> 0 の値を設定しなければなりません。 + そうでなければデータが破損してしまいます。 + これが必要なホストは RFC 2068 に違反しています。</para></listitem> + </varlistentry> + + <varlistentry><term>ftp</term> +<!-- + <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the + standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is + overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp + proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the + configuration file. This entry specifies the commands to send to tell + the proxy server what to connect to. Please see + &configureindex; for an example of + how to do this. The subsitution variables available are + <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> + <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> + Each is taken from it's respective URI component.</para> +--> + <listitem><para>FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。 + <literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しますが、 + 環境変数 <envar>ftp_proxy</envar> で上書きされます。 + ftp プロキシを使用するには、設定ファイルに <literal>ftp::ProxyLogin</literal> + スクリプトを設定する必要があります。 + プロキシサーバに送信する接続コマンドを、このエントリに設定します。 + どのようにするのかは &configureindex; の例を参照してください。 + その他にも、<literal>$(PROXY_USER)</literal> + <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> + <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> + <literal>$(SITE_PORT)</literal> が利用可能です。 + いずれも、それぞれ URI を構成するトークンです。</para> + +<!-- + <para>The option <literal>timeout</literal> sets the timeout timer used by the method, + this applies to all things including connection timeout and data timeout.</para> +--> + <para><literal>timeout</literal> オプションは、 + この方法でのタイムアウトまでの時間を設定します。 + これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para> + +<!-- + <para>Several settings are provided to control passive mode. Generally it is + safe to leave passive mode on, it works in nearly every environment. + However some situations require that passive mode be disabled and port + mode ftp used instead. This can be done globally, for connections that + go through a proxy or for a specific host (See the sample config file + for examples).</para> +--> + <para>設定のいくつかは、パッシブモードを制御するものです。 + 一般的に、パッシブモードのままにしておく方が安全で、 + ほぼどんな環境でも動作します。 + しかしある状況下では、パッシブモードが無効のため、 + 代わりにポートモード ftp を使用する必要があります。 + この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です。 + (設定例はサンプル設定ファイルを参照してください)</para> + +<!-- + <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar> + environment variable to a http url - see the discussion of the http method + above for syntax. You cannot set this in the configuration file and it is + not recommended to use FTP over HTTP due to its low efficiency.</para> +--> + <para>環境変数 <envar>ftp_proxy</envar> の http url により + FTP over HTTP のプロキシが利用可能になります。 + 文法は上の http についての説明を参照してください。 + 設定ファイルの中でこれをセットすることはできません。 + また、効率が悪いため FTP over HTTP を使用するのは推奨しません。</para> + +<!-- + <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428 + <literal>EPSV</literal> and <literal>EPRT</literal> commands. The defaut is false, which means + these commands are only used if the control connection is IPv6. Setting this + to true forces their use even on IPv4 connections. Note that most FTP servers + do not support RFC2428.</para></listitem> +--> + <para><literal>ForceExtended</literal> の設定は RFC2428 の + <literal>EPSV</literal> コマンドと <literal>EPRT</literal> + コマンドの使用を制御します。デフォルトでは false です。 + これは、コントロールコネクションが IPv6 の時にのみ、 + このコマンドを使用するということです。 + これを true にセットすると、IPv4 コネクションでも強制的に、 + このコマンドを使用します。 + 注) ほとんどの FTP サーバは RFC2428 をサポートしていません。</para></listitem> + </varlistentry> + + <varlistentry><term>cdrom</term> +<!-- + <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point, + <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive + as specified in <filename>/etc/fstab</filename>. It is possible to provide + alternate mount and unmount commands if your mount point cannot be listed + in the fstab (such as an SMB mount and old mount packages). The syntax + is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within + the cdrom block. It is important to have the trailing slash. Unmount + commands can be specified using UMount.</para></listitem> +--> + <listitem><para>CDROM URI - マウントポイントの設定のみを行います。 + <filename>/etc/fstab</filename> で設定されているように、 + CDROM ドライブのマウントポイントを + <literal>cdrom::Mount</literal> に設定しなければなりません。 + (SMB マウントや古い mount パッケージなど) マウントポイントが fstab + に記述できない場合、かわりにマウント・アンマウントコマンドも使用できます。 + 文法は、cdrom ブロックを + <literallayout>"/cdrom/"::Mount "foo";</literallayout> の形で記述します。 + スラッシュを後につけるのは重要です。 + アンマウントコマンドは UMount で指定することができます。</para></listitem> + </varlistentry> + + <varlistentry><term>gpgv</term> +<!-- + <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv. + <literal>gpgv::Options</literal> Additional options passed to gpgv. + </para></listitem> +--> + <listitem><para>GPGV URI - GPGV URI 用の唯一のオプションは、 + gpgv に渡す追加パラメータのオプションです。 + <literal>gpgv::Options</literal> gpgv に渡す追加オプション。 + </para></listitem> + </varlistentry> + + </variablelist> + </para> + </refsect1> + +<!-- + <refsect1><title>Directories</title> +--> + <refsect1><title>ディレクトリ</title> + +<!-- + <para>The <literal>Dir::State</literal> section has directories that pertain to local + state information. <literal>lists</literal> is the directory to place downloaded + package lists in and <literal>status</literal> is the name of the dpkg status file. + <literal>preferences</literal> is the name of the APT preferences file. + <literal>Dir::State</literal> contains the default directory to prefix on all sub + items if they do not start with <filename>/</filename> or <filename>./</filename>.</para> +--> + <para><literal>Dir::State</literal> セクションは、 + ローカル状態情報に関するディレクトリを保持します。 + <literal>lists</literal> は、 + ダウンロードしたパッケージ一覧を格納するディレクトリで、 + <literal>status</literal> は dpkg の状態ファイルの名前を表します。 + <literal>preferences</literal> は APT の 設定ファイルの名前です。 + <literal>Dir::State</literal> には、 + <filename>/</filename> や <filename>./</filename> で始まらない + 全サブアイテムに付加する、デフォルトディレクトリを含んでいます。</para> + +<!-- + <para><literal>Dir::Cache</literal> contains locations pertaining to local cache + information, such as the two package caches <literal>srcpkgcache</literal> and + <literal>pkgcache</literal> as well as the location to place downloaded archives, + <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off + by setting their names to be blank. This will slow down startup but + save disk space. It is probably prefered to turn off the pkgcache rather + than the srcpkgcache. Like <literal>Dir::State</literal> the default + directory is contained in <literal>Dir::Cache</literal></para> +--> + <para><literal>Dir::Cache</literal> は、 + ローカルキャッシュ情報に関する場所を格納しています。これは、 + ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::archives</literal> + と同様に、<literal>srcpkgcache</literal> と <literal>pkgcache</literal> + のパッケージキャッシュの場所となります。 + それぞれを空にセットすることで、キャッシュの生成を無効にできます。 + おそらく、srcpkgcache よりも pkgcache を無効にすることが多いと思います。 + <literal>Dir::State</literal> と同様、<literal>Dir::Cache</literal> + はデフォルトディレクトリを含んでいます。</para> + +<!-- + <para><literal>Dir::Etc</literal> contains the location of configuration files, + <literal>sourcelist</literal> gives the location of the sourcelist and + <literal>main</literal> is the default configuration file (setting has no effect, + unless it is done from the config file specified by + <envar>APT_CONFIG</envar>).</para> +--> + <para><literal>Dir::Etc</literal> は設定ファイルの場所を格納しています。 + <literal>sourcelist</literal> はソースリストの場所を示し、 + <literal>main</literal> はデフォルトの設定ファイルです。 + (<envar>APT_CONFIG</envar> で設定ファイルを指定された場合のみ、 + この設定の効果があります)</para> + +<!-- + <para>The <literal>Dir::Parts</literal> setting reads in all the config fragments in + lexical order from the directory specified. After this is done then the + main config file is loaded.</para> +--> + <para><literal>Dir::Parts</literal> 設定は、指定されたディレクトリから、 + 字句単位の全ての設定断片を読みこみます。 + これを設定した後に、メイン設定ファイルをロードします。</para> + +<!-- + <para>Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> + specifies the location of the method handlers and <literal>gzip</literal>, + <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> + <literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> specify the location + of the respective programs.</para> +--> + <para>バイナリプログラムは <literal>Dir::Bin</literal> で指定します。 + <literal>Dir::Bin::Methods</literal> はメソッドハンドラの場所を指定し、 + <literal>gzip</literal>, <literal>dpkg</literal>, + <literal>apt-get</literal>, <literal>dpkg-source</literal>, + <literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> + はそれぞれプログラムの場所を指定します。</para> + </refsect1> + +<!-- + <refsect1><title>APT in DSelect</title> +--> + <refsect1><title>DSelect での APT</title> +<!-- + <para> + When APT is used as a &dselect; method several configuration directives + control the default behaviour. These are in the <literal>DSelect</literal> section.</para> +--> + <para> + &dselect; 上で APT を使用する際、 + <literal>DSelect</literal> セクション以下の設定項目で、 + デフォルトの動作を制御します。</para> + <variablelist> + <varlistentry><term>Clean</term> +<!-- + <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto, + pre-auto and never. always and prompt will remove all packages from + the cache after upgrading, prompt (the default) does so conditionally. + auto removes only those packages which are no longer downloadable + (replaced with a new version for instance). pre-auto performs this + action before downloading new packages.</para></listitem> +--> + <listitem><para>キャッシュクリーンモード - + この値は always, prompt, auto, pre-auto, never のうちひとつを取ります。 + always と prompt は更新後、全パッケージをキャッシュから削除します。 + (デフォルトの) prompt では条件付きで削除します。 + auto はダウンロード不能パッケージ (例えば新バージョンで置き換えられたもの) + を削除します。pre-auto はこの動作を、 + 新パッケージをダウンロードする直前に行います。</para></listitem> + </varlistentry> + + <varlistentry><term>options</term> +<!-- + <listitem><para>The contents of this variable is passed to &apt-get; as command line + options when it is run for the install phase.</para></listitem> +--> + <listitem><para>この変数の内容は、 + install 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem> + </varlistentry> + + <varlistentry><term>Updateoptions</term> +<!-- + <listitem><para>The contents of this variable is passed to &apt-get; as command line + options when it is run for the update phase.</para></listitem> +--> + <listitem><para>この変数の内容は、 + update 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem> + </varlistentry> + + <varlistentry><term>PromptAfterUpdate</term> +<!-- + <listitem><para>If true the [U]pdate operation in &dselect; will always prompt to continue. + The default is to prompt only on error.</para></listitem> +--> + <listitem><para>true の場合、 + &dselect; の [U]pdate 実行時に、続行のためのプロンプトを毎回表示します。 + デフォルトはエラーが発生した場合のみです。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>How APT calls dpkg</title> +--> + <refsect1><title>APT が dpkg を呼ぶ方法</title> +<!-- + <para>Several configuration directives control how APT invokes &dpkg;. These are + in the <literal>DPkg</literal> section.</para> +--> + <para>数種の設定項目で APT がどのように &dpkg; を呼び出すかを制御できます。 + <literal>DPkg</literal> セクションにあります。</para> + + <variablelist> + <varlistentry><term>options</term> +<!-- + <listitem><para>This is a list of options to pass to dpkg. The options must be specified + using the list notation and each list item is passed as a single argument + to &dpkg;.</para></listitem> +--> + <listitem><para>dpkg に渡すオプションのリストです。 + オプションは、リスト記法を使用して指定しなければなりません。 + また、各リストは単一の引数として &dpkg; に渡されます。</para></listitem> + </varlistentry> + + <varlistentry><term>Pre-Invoke</term><term>Post-Invoke</term> +<!-- + <listitem><para>This is a list of shell commands to run before/after invoking &dpkg;. + Like <literal>options</literal> this must be specified in list notation. The + commands are invoked in order using <filename>/bin/sh</filename>, should any + fail APT will abort.</para></listitem> +--> + <listitem><para>&dpkg; を呼び出す前後で実行するシェルコマンドのリストです。 + <literal>options</literal> のようにリスト記法で指定しなければなりません。 + コマンドは <filename>/bin/sh</filename> を使用して呼び出され、 + 何か問題があれば、APT は異常終了します。</para></listitem> + </varlistentry> + + <varlistentry><term>Pre-Install-Pkgs</term> +<!-- + <listitem><para>This is a list of shell commands to run before invoking dpkg. Like + <literal>options</literal> this must be specified in list notation. The commands + are invoked in order using <filename>/bin/sh</filename>, should any fail APT + will abort. APT will pass to the commands on standard input the + filenames of all .deb files it is going to install, one per line.</para> +--> + <listitem><para>&dpkg; を呼び出す前に実行するシェルコマンドのリストです。 + <literal>options</literal> のようにリスト記法で指定しなければなりません。 + コマンドは <filename>/bin/sh</filename> を通して呼び出され、 + 何か問題があれば、APT は異常終了します。 + APT はインストールしようとする全 .deb ファイルのファイル名を、 + ひとつずつコマンドの標準入力に送ります。</para> + +<!-- + <para>Version 2 of this protocol dumps more information, including the + protocol version, the APT configuration space and the packages, files + and versions being changed. Version 2 is enabled by setting + <literal>DPkg::Tools::options::cmd::Version</literal> to 2. <literal>cmd</literal> is a + command given to <literal>Pre-Install-Pkgs</literal>.</para></listitem> +--> + <para>このプロトコルのバージョン 2 では、(プロトコルのバージョンや + APT 設定スペース、パッケージを含む) 詳細情報やファイル、 + 変更されているバージョンを出力します。 + <literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、 + バージョン 2 を有効にできます。 + <literal>cmd</literal> は <literal>Pre-Install-Pkgs</literal> + で与えられるコマンドです。</para></listitem> + </varlistentry> + + <varlistentry><term>Run-Directory</term> +<!-- + <listitem><para>APT chdirs to this directory before invoking dpkg, the default is + <filename>/</filename>.</para></listitem> +--> + <listitem><para>APT は dpkg を呼び出す前にこのディレクトリに移動します。 + デフォルトは <filename>/</filename> です。</para></listitem> + </varlistentry> + + <varlistentry><term>Build-options</term> +<!-- + <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages, + the default is to disable signing and produce all binaries.</para></listitem> +--> + <listitem><para>これらのオプションは、 + パッケージのコンパイル時に &dpkg-buildpackage; に渡されます。 + デフォルトでは、署名を無効にし、全バイナリを生成します。</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + +<!-- + <refsect1><title>Debug options</title> +--> + <refsect1><title>デバッグオプション</title> +<!-- + <para>Most of the options in the <literal>debug</literal> section are not interesting to + the normal user, however <literal>Debug::pkgProblemResolver</literal> shows + interesting output about the decisions dist-upgrade makes. + <literal>Debug::NoLocking</literal> disables file locking so APT can do some + operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the + command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will + disable the inclusion of statfs data in CDROM IDs. + <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method. + </para> +--> + <para><literal>debug</literal> の多くのオプションは、 + 普通のユーザにとって興味を引くものではありません。 + しかし <literal>Debug::pkgProblemResolver</literal> で、 + dist-upgrade の判断についての興味深い出力が得られます。 + <literal>Debug::NoLocking</literal>は、 + APT が非 root で操作できるようにファイルのロックを無効にしますし、 + <literal>Debug::pkgDPkgPM</literal>は、 + dpkg を呼ぶ際のコマンドラインを出力します。 + <literal>Debug::IdentCdrom</literal> は、 + CDROM ID の状態データの包含を無効にします。 + <literal>Debug::Acquire::gpgv</literal> gpgv 法のデバッグです。 + </para> + </refsect1> + +<!-- + <refsect1><title>Examples</title> +--> + <refsect1><title>例</title> +<!-- + <para>&configureindex; is a + configuration file showing example values for all possible + options.</para> +--> + <para>&configureindex; に、全利用可能オプションのデフォルト値を参照できる、 + 設定ファイルのサンプルがあります。</para> + </refsect1> + +<!-- + <refsect1><title>Files</title> +--> + <refsect1><title>ファイル</title> + <para><filename>/etc/apt/apt.conf</filename></para> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.</para> + </refsect1> + + &manbugs; + &translator; + +</refentry> + diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index 495322997..3fa931ae5 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -2,178 +2,327 @@ <!-- Some common paths.. --> <!ENTITY docdir "/usr/share/doc/apt/"> -<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>"> -<!ENTITY aptconfdir "<filename>/etc/apt.conf</>"> +<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>"> +<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>"> <!ENTITY statedir "/var/lib/apt"> <!ENTITY cachedir "/var/cache/apt"> <!-- Cross references to other man pages --> -<!ENTITY apt-conf "<CiteRefEntry> - <RefEntryTitle><filename/apt.conf/</RefEntryTitle> - <ManVolNum/5/ - </CiteRefEntry>"> - -<!ENTITY apt-get "<CiteRefEntry> - <RefEntryTitle><command/apt-get/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY apt-config "<CiteRefEntry> - <RefEntryTitle><command/apt-config/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY apt-cdrom "<CiteRefEntry> - <RefEntryTitle><command/apt-cdrom/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY apt-cache "<CiteRefEntry> - <RefEntryTitle><command/apt-cache/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY apt-preferences "<CiteRefEntry> - <RefEntryTitle><command/apt_preferences/</RefEntryTitle> - <ManVolNum/5/ - </CiteRefEntry>"> - -<!ENTITY sources-list "<CiteRefEntry> - <RefEntryTitle><filename/sources.list/</RefEntryTitle> - <ManVolNum/5/ - </CiteRefEntry>"> - -<!ENTITY reportbug "<CiteRefEntry> - <RefEntryTitle><command/reportbug/</RefEntryTitle> - <ManVolNum/1/ - </CiteRefEntry>"> - -<!ENTITY dpkg "<CiteRefEntry> - <RefEntryTitle><command/dpkg/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY dpkg-buildpackage "<CiteRefEntry> - <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle> - <ManVolNum/1/ - </CiteRefEntry>"> - -<!ENTITY gzip "<CiteRefEntry> - <RefEntryTitle><command/gzip/</RefEntryTitle> - <ManVolNum/1/ - </CiteRefEntry>"> - -<!ENTITY dpkg-scanpackages "<CiteRefEntry> - <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY dpkg-scansources "<CiteRefEntry> - <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> - -<!ENTITY dselect "<CiteRefEntry> - <RefEntryTitle><command/dselect/</RefEntryTitle> - <ManVolNum/8/ - </CiteRefEntry>"> +<!ENTITY apt-conf "<citerefentry> + <refentrytitle><filename>apt.conf</filename></refentrytitle> + <manvolnum>5</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-get "<citerefentry> + <refentrytitle><command>apt-get</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-config "<citerefentry> + <refentrytitle><command>apt-config</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-cdrom "<citerefentry> + <refentrytitle><command>apt-cdrom</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-cache "<citerefentry> + <refentrytitle><command>apt-cache</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-preferences "<citerefentry> + <refentrytitle><command>apt_preferences</command></refentrytitle> + <manvolnum>5</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-key "<citerefentry> + <refentrytitle><command>apt-key</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-secure "<citerefentry> + <refentrytitle>apt-secure</refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY apt-archive "<citerefentry> + <refentrytitle><filename>apt-archive</filename></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + + +<!ENTITY sources-list "<citerefentry> + <refentrytitle><filename>sources.list</filename></refentrytitle> + <manvolnum>5</manvolnum> + </citerefentry>" +> + +<!ENTITY reportbug "<citerefentry> + <refentrytitle><command>reportbug</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY dpkg "<citerefentry> + <refentrytitle><command>dpkg</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY dpkg-buildpackage "<citerefentry> + <refentrytitle><command>dpkg-buildpackage</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY gzip "<citerefentry> + <refentrytitle><command>gzip</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY dpkg-scanpackages "<citerefentry> + <refentrytitle><command>dpkg-scanpackages</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY dpkg-scansources "<citerefentry> + <refentrytitle><command>dpkg-scansources</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY dselect "<citerefentry> + <refentrytitle><command>dselect</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY aptitude "<citerefentry> + <refentrytitle><command>aptitude</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY synaptic "<citerefentry> + <refentrytitle><command>synaptic</command></refentrytitle> + <manvolnum>8</manvolnum> + </citerefentry>" +> + +<!ENTITY debsign "<citerefentry> + <refentrytitle><command>debsign</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY debsig-verify "<citerefentry> + <refentrytitle><command>debsig-verify</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY gpg "<citerefentry> + <refentrytitle><command>gpg</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> <!-- Boiler plate docinfo section --> <!ENTITY apt-docinfo " - <docinfo> - <address><email>apt@packages.debian.org</></address> - <author><firstname>Jason</> <surname>Gunthorpe</></> - <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></> - <date>12 March 2001</> - </docinfo> + <refentryinfo> + <address><email>apt@packages.debian.org</email></address> + <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author> + <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright> + <date>14 December 2003</date> + <productname>Linux</productname> + + </refentryinfo> "> +<!ENTITY apt-email " + <address> + <email>apt@packages.debian.org</email> + </address> +"> + +<!ENTITY apt-author.jgunthorpe " + <author> + <firstname>Jason</firstname> + <surname>Gunthorpe</surname> + </author> +"> + +<!ENTITY apt-author.team " + <author> + <othername>APT team</othername> + </author> +"> + +<!ENTITY apt-product " + <productname>Linux</productname> +"> + +<!ENTITY apt-email " + <address> + <email>apt@packages.debian.org</email> + </address> +"> + +<!ENTITY apt-author.jgunthorpe " + <author> + <firstname>Jason</firstname> + <surname>Gunthorpe</surname> + </author> +"> + +<!ENTITY apt-author.team " + <author> + <othername>APT team</othername> + </author> +"> + +<!ENTITY apt-copyright " + <copyright> + <holder>Jason Gunthorpe</holder> + <year>1998-2001</year> + </copyright> +"> + +<!ENTITY apt-product " + <productname>Linux</productname> +"> + <!-- Boiler plate Bug reporting section --> <!ENTITY manbugs " - <RefSect1><Title>Х</> - <para> - <ulink url='http://bugs.debian.org/apt'>APT Хڡ</> - ȤƤ - APT ΥХ𤹤ϡ - <filename>/usr/share/doc/debian/bug-reporting.txt</> - &reportbug; ޥɤȤƤ +<!-- + <refsect1><title>Bugs</title> +--> + <refsect1><title>バグ</title> +<!-- + <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. + If you wish to report a bug in APT, please see + <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the + &reportbug; command. </para> - </RefSect1> +--> + <para><ulink url='http://bugs.debian.org/src:apt'>APT バグページ</ulink>を + ご覧ください。 + APT のバグを報告する場合は、 + <filename>/usr/share/doc/debian/bug-reporting.txt</filename> や + &reportbug; コマンドをご覧ください。 + </para> + </refsect1> "> <!-- Boiler plate Author section --> <!ENTITY manauthor " - <RefSect1><Title></> - <para> - APT the APT team <email>apt@packages.debian.org</> ˤäƽޤ +<!-- + <refsect1><title>Author</title> +--> + <refsect1><title>著者</title> +<!-- + <para>APT was written by the APT team <email>apt@packages.debian.org</email>. +--> + <para>APT は the APT team <email>apt@packages.debian.org</email> によって + 書かれました。 </para> - </RefSect1> + </refsect1> "> -<!-- Translator section (Kurasawa Add)--> +<!-- Boiler plate Translator section (nabetaro add)--> <!ENTITY translator " - <RefSect1><Title></> - <para> - ߷ ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004) - </para> - <para> - Debian JP Documentation ML <email>debian-doc@debian.or.jp</> - </para> - </RefSect1> + <refsect1><title>訳者</title> + <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006), + Debian JP Documentation ML <email>debian-doc@debian.or.jp</email> + </para> + </refsect1> "> <!-- Should be used within the option section of the text to put in the blurb about -h, -v, -c and -o --> <!ENTITY apt-commonoptions " - <VarListEntry><term><option/-h/</><term><option/--help/</> - <ListItem><Para> - Ȥûɽޤ - </Para></ListItem> - </VarListEntry> + <varlistentry><term><option>-h</option></term> + <term><option>--help</option></term> +<!-- + <listitem><para>Show a short usage summary. +--> + <listitem><para>使い方の短い要約を表示します。 + </para> + </listitem> + </varlistentry> - <VarListEntry><term><option/-v/</><term><option/--version/</> - <ListItem><Para> - ץΥСɽޤ - </Para></ListItem> - </VarListEntry> - - <VarListEntry><term><option/-c/</><term><option/--config-file/</> - <ListItem><Para> + <varlistentry> + <term><option>-v</option></term> + <term><option>--version</option></term> <!-- - Configuration File; Specify a configuration file to use. + <listitem><para>Show the program version. +--> + <listitem><para>プログラムのバージョンを表示します。 + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>-c</option></term> + <term><option>--config-file</option></term> +<!-- + <listitem><para>Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See &apt-conf; for syntax information. + </para> --> - ե롣 Ѥեꤷޤ - ե뤬ɤʤϥǥեȤեɤ߹ߤޤ - ʸˡξ &apt-conf; ȤƤ - </Para></ListItem> - </VarListEntry> + <listitem><para>設定ファイル。 使用する設定ファイルを指定します。 + この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。 + 文法については &apt-conf; を参照してください。 + </para> + </listitem> + </varlistentry> - <VarListEntry><term><option/-o/</><term><option/--option/</> - <ListItem><Para> + <varlistentry> + <term><option>-o</option></term> + <term><option>--option</option></term> <!-- - Set a Configuration Option; This will set an arbitary configuration - option. The syntax is <option>-o Foo::Bar=bar</>. + <listitem><para>Set a Configuration Option; This will set an arbitary + configuration option. The syntax is <option>-o Foo::Bar=bar</option>. + </para> --> - ꥪץΥå - ǤդꥪץåȤޤ - ʸˡ <option>-o Foo::Bar=bar</> Ȥʤޤ - </Para></ListItem> - </VarListEntry> + <listitem><para>設定オプションのセット。任意の設定オプションをセットします。 + 文法は <option>-o Foo::Bar=bar</option> となります。 + </para> + </listitem> + </varlistentry> "> <!-- Should be used within the option section of the text to put in the blurb about -h, -v, -c and -o --> <!ENTITY apt-cmdblurb " - <para> <!-- - All command line options may be set using the configuration file, the + <para>All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like - <option/-f-/,<option/- -no-f/, <option/-f=no/ or several other variations. + <option>-f-</option>,<option>-\-no-f</option>, <option>-f=no</option> + or several other variations. + </para> --> - Ǽץϡ٤եѤǤޤ - ե˽ͤȤ륪ץ <option/-f-/,<option/--no-f/, - <option/-f=no/ ʤɤΤ褦ˤƾ뤳ȤǤޤ + <para>この説明で示したオプションは、 + すべて設定ファイルを使用して設定できます。 + 設定ファイルに書いた真偽値をとるオプションは + <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option> + などのようにして上書きできます。 </para> "> + diff --git a/doc/ja/apt_preferences.ja.5.xml b/doc/ja/apt_preferences.ja.5.xml new file mode 100644 index 000000000..a7e63a961 --- /dev/null +++ b/doc/ja/apt_preferences.ja.5.xml @@ -0,0 +1,940 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>apt_preferences</refentrytitle> + <manvolnum>5</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt_preferences</refname> +<!-- + <refpurpose>Preference control file for APT</refpurpose> +--> + <refpurpose>APT 設定制御ファイル</refpurpose> + </refnamediv> + +<refsect1> +<!-- +<title>Description</title> +--> +<title>説明</title> +<!-- +<para>The APT preferences file <filename>/etc/apt/preferences</filename> +can be used to control which versions of packages will be selected +for installation.</para> +--> +<para>APT 設定ファイル <filename>/etc/apt/preferences</filename> は、 +インストールするパッケージのバージョン選択を制御するのに使用します。</para> + +<!-- +<para>Several versions of a package may be available for installation when +the &sources-list; file contains references to more than one distribution +(for example, <literal>stable</literal> and <literal>testing</literal>). +APT assigns a priority to each version that is available. +Subject to dependency constraints, <command>apt-get</command> selects the +version with the highest priority for installation. +The APT preferences file overrides the priorities that APT assigns to +package versions by default, thus giving the user control over which +one is selected for installation.</para> +--> +<para>&sources-list; ファイルに複数のディストリビューション +(<literal>stable</literal> と <literal>testing</literal> など) +が指定されていて、 +パッケージに対し複数のバージョンがインストールできることがあります。 +このとき APT は、利用できるバージョンごとに優先度を割り当てます。 +依存関係規則を条件として、<command>apt-get</command> は、 +最も高い優先度を持つバージョンをインストールするよう選択します。 +APT 設定ファイルは、APT がデフォルトで割り当てた、 +パッケージのバージョンの優先度を上書きします。 +その結果、インストールするものの選択を、ユーザが選択できるようになります。</para> + +<!-- +<para>Several instances of the same version of a package may be available when +the &sources-list; file contains references to more than one source. +In this case <command>apt-get</command> downloads the instance listed +earliest in the &sources-list; file. +The APT preferences file does not affect the choice of instance, only +the choice of version.</para> +--> +<para>&sources-list; ファイルに複数の参照が書かれている場合、 +パッケージの同じバージョンのインスタンスが複数利用できる可能性があります。 +この場合、<command>apt-get</command> は &sources-list; +ファイルの初めの方に指定されているところからダウンロードします。 +APT 設定ファイルは、バージョンの選択にのみ影響し、 +インスタンスの選択には影響しません。</para> + +<!-- +<refsect2><title>APT's Default Priority Assignments</title> +--> +<refsect2><title>APT のデフォルト優先度の割り当て</title> + +<!-- +<para>If there is no preferences file or if there is no entry in the file +that applies to a particular version then the priority assigned to that +version is the priority of the distribution to which that version +belongs. It is possible to single out a distribution, "the target release", +which receives a higher priority than other distributions do by default. +The target release can be set on the <command>apt-get</command> command +line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>. +For example, +--> +<para>設定ファイルがなかったり、 +設定ファイルに、特定のパッケージを割り当てるエントリがない場合、 +そのバージョンの優先度は、 +そのバージョンが属しているディストリビューションの優先度となります。 +デフォルトで他のディストリビューションより高い優先度を持つ、 +特定のディストリビューションを「ターゲットリリース」としておくのは可能です。 +ターゲットリリースは、<command>apt-get</command> のコマンドラインで設定したり、 +APT 設定ファイル <filename>/etc/apt/apt.conf</filename> で設定したりできます。 +例えば以下のようになります。 + +<programlisting> +<command>apt-get install -t testing <replaceable>some-package</replaceable></command> +</programlisting> +<programlisting> +APT::Default-Release "stable"; +</programlisting> +</para> + +<!-- +<para>If the target release has been specified then APT uses the following +algorithm to set the priorities of the versions of a package. Assign: +--> +<para>ターゲットリリースが指定されると、APT は以下のアルゴリズムで、 +パッケージのバージョンの優先度を設定します。このように割り当てます。 + +<variablelist> +<varlistentry> +<!-- +<term>priority 100</term> +--> +<term>優先度 100</term> +<!-- +<listitem><simpara>to the version that is already installed (if any).</simpara></listitem> +--> +<listitem><simpara>(あるならば) 既にインストールされているバージョン。</simpara></listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>priority 500</term> +--> +<term>優先度 500</term> +<!-- +<listitem><simpara>to the versions that are not installed and do not belong to the target release.</simpara></listitem> +--> +<listitem><simpara>インストールされておらず、ターゲットリリースに含まれないバージョン。</simpara></listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>priority 990</term> +--> +<term>優先度 990</term> +<!-- +<listitem><simpara>to the versions that are not installed and belong to the target release.</simpara></listitem> +--> +<listitem><simpara>インストールされておらず、ターゲットリリースに含まれるバージョン。</simpara></listitem> +</varlistentry> +</variablelist> +</para> + +<!-- +<para>If the target release has not been specified then APT simply assigns +priority 100 to all installed package versions and priority 500 to all +uninstalled package versions.</para> +--> +<para>ターゲットリリースが指定されていなければ、 +APT は単純にインストールしているパッケージのバージョンには 100 を、 +インストールしていないパッケージのバージョンには 500 を割り当てます。</para> + +<!-- +<para>APT then applies the following rules, listed in order of precedence, +to determine which version of a package to install. +--> +<para>APT は、インストールするパッケージのバージョンを決定するために、 +以下のルールを上から順番に適用します。 +<itemizedlist> +<!-- +<listitem><simpara>Never downgrade unless the priority of an available +version exceeds 1000. ("Downgrading" is installing a less recent version +of a package in place of a more recent version. Note that none of APT's +default priorities exceeds 1000; such high priorities can only be set in +the preferences file. Note also that downgrading a package +can be risky.)</simpara></listitem> +--> +<listitem><simpara>有効なバージョンの優先度が 1000 を越えない場合、 +決してダウングレードしません。 +(「ダウングレード」は、現在のパッケージのバージョンよりも、 +小さいバージョンのものをインストールします。 +APT のデフォルト優先度が 1000 を越えないことに注意してください。 +そのような優先度は設定ファイルでのみ設定できます。 +また、パッケージのダウングレードは危険であることにも注意してください)</simpara></listitem> +<!-- +<listitem><simpara>Install the highest priority version.</simpara></listitem> +--> +<listitem><simpara>最も高い優先度のバージョンをインストールします。</simpara></listitem> +<!-- +<listitem><simpara>If two or more versions have the same priority, +install the most recent one (that is, the one with the higher version +number).</simpara></listitem> +--> +<listitem><simpara>同じ優先度のバージョンが複数存在する場合、 +最も新しいもの (最もバージョン番号が高いもの) をインストールします。</simpara></listitem> +<!-- +<listitem><simpara>If two or more versions have the same priority and +version number but either the packages differ in some of their metadata or the +<literal>-\-reinstall</literal> option is given, install the uninstalled one.</simpara></listitem> +--> +<listitem><simpara>優先度・バージョン番号が同じものが複数存在し、 +そのパッケージのメタデータが異なるか <literal>--reinstall</literal> +オプションが与えられている場合、 +インストールされていないものをインストールします。</simpara></listitem> +</itemizedlist> +</para> + +<!-- +<para>In a typical situation, the installed version of a package (priority 100) +is not as recent as one of the versions available from the sources listed in +the &sources-list; file (priority 500 or 990). Then the package will be upgraded +when <command>apt-get install <replaceable>some-package</replaceable></command> +or <command>apt-get upgrade</command> is executed. +--> +<para>よくある状況として、 +あるインストールされているパッケージのバージョン (優先度 100) が、 +&sources-list; ファイルのリストから得られるバージョン (優先度 500 か 990) +よりも新しくないということがあります。この場合、 +<command>apt-get install <replaceable>some-package</replaceable></command> +や <command>apt-get upgrade</command> を実行するとパッケージが更新されます。 +</para> + +<!-- +<para>More rarely, the installed version of a package is <emphasis>more</emphasis> recent +than any of the other available versions. The package will not be downgraded +when <command>apt-get install <replaceable>some-package</replaceable></command> +or <command>apt-get upgrade</command> is executed.</para> +--> +<para>まれに、インストールされているパッケージのバージョンが、 +<emphasis>他の有効なバージョンよりも</emphasis>新しい場合があります。 +この時 +<command>apt-get install <replaceable>some-package</replaceable></command> +や <command>apt-get upgrade</command> を実行しても、 +ダウングレードしません。</para> + +<!-- +<para>Sometimes the installed version of a package is more recent than the +version belonging to the target release, but not as recent as a version +belonging to some other distribution. Such a package will indeed be upgraded +when <command>apt-get install <replaceable>some-package</replaceable></command> +or <command>apt-get upgrade</command> is executed, +because at least <emphasis>one</emphasis> of the available versions has a higher +priority than the installed version.</para> +--> +<para>時々、インストールしているパッケージのバージョンが、 +ターゲットリリースに属するバージョンよりも新しく、 +他のディストリビューションよりも古い場合があります。 +そのようなパッケージに対して +<command>apt-get install <replaceable>some-package</replaceable></command> +や <command>apt-get upgrade</command> を実行すると、 +パッケージは更新されます。 +この場合、インストールされているバージョンよりも、 +少なくとも<emphasis>ひとつ</emphasis>は、 +高い優先度を持つ有効なパッケージがあるからです。</para> +</refsect2> + +<!-- +<refsect2><title>The Effect of APT Preferences</title> +--> +<refsect2><title>APT 設定の効果</title> + +<!-- +<para>The APT preferences file allows the system administrator to control the +assignment of priorities. The file consists of one or more multi-line records +separated by blank lines. Records can have one of two forms, a specific form +and a general form. +--> +<para>APT 設定ファイルを使うと、 +システム管理者が優先度を割り当てられるようになります。 +ファイルは、空白行で区切られた、複数行からなるレコードで構成されています。 +レコードは特定形式か、汎用形式のどちらかの形式をとります。 +<itemizedlist> +<listitem> +<!-- +<simpara>The specific form assigns a priority (a "Pin-Priority") to a +specified package and specified version or version range. For example, +the following record assigns a high priority to all versions of +the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara> +--> +<simpara>特定形式は、優先度 ("Pin-Priority") を、 +指定したパッケージの指定したバージョン (範囲) について割り当てます。 +例えば以下のレコードは、 +"<literal>5.8</literal>" で始まる <filename>perl</filename> パッケージを、 +高い優先度に設定します。</simpara> + +<programlisting> +Package: perl +Pin: version 5.8* +Pin-Priority: 1001 +</programlisting> +</listitem> + +<!-- +<listitem><simpara>The general form assigns a priority to all of the package versions in a +given distribution (that is, to all the versions of packages that are +listed in a certain <filename>Release</filename> file) or to all of the package +versions coming from a particular Internet site, as identified by the +site's fully qualified domain name.</simpara> +--> +<listitem><simpara>汎用形式は、与えられたディストリビューションにある、 +すべてのパッケージ (<filename>Release</filename> ファイルに列挙したパッケージ) +の優先度や、FQDNで指定した、 +特定のインターネットサイトから取得するパッケージの優先度を割り当てます。</simpara> + +<!-- +<simpara>This general-form entry in the APT preferences file applies only +to groups of packages. For example, the following record assigns a high +priority to all package versions available from the local site.</simpara> +--> +<simpara>APT 設定ファイルに書かれている汎用形式のエントリは、 +パッケージのグループについてのみ適用されます。 +例えば以下のレコードは、ローカルサイトにある全パッケージについて、 +高い優先度を割り当てます。</simpara> + +<programlisting> +Package: * +Pin: origin "" +Pin-Priority: 999 +</programlisting> + +<!-- +<simpara>A note of caution: the keyword used here is "<literal>origin</literal>". +This should not be confused with the Origin of a distribution as +specified in a <filename>Release</filename> file. What follows the "Origin:" tag +in a <filename>Release</filename> file is not an Internet address +but an author or vendor name, such as "Debian" or "Ximian".</simpara> +--> +<simpara>注: ここで使用しているキーワードは "<literal>origin</literal>" です。 +<filename>Release</filename> ファイルに指定されたような、 +ディストリビューションの Origin と混同しないようにしてください。 +<filename>Release</filename> ファイルにある "Origin:" タグは、 +インターネットアドレスではなく、 +"Debian" や "Ximian" といった作者やベンダ名です。</simpara> + +<!-- +<simpara>The following record assigns a low priority to all package versions +belonging to any distribution whose Archive name is "<literal>unstable</literal>".</simpara> +--> +<simpara>以下のレコードは、アーカイブ名が "<literal>unstable</literal>" +となっているディストリビューションに属するパッケージを、 +すべて低い優先度に割り当てます。</simpara> + +<programlisting> +Package: * +Pin: release a=unstable +Pin-Priority: 50 +</programlisting> + +<!-- +<simpara>The following record assigns a high priority to all package versions +belonging to any release whose Archive name is "<literal>stable</literal>" +and whose release Version number is "<literal>3.0</literal>".</simpara> +--> +<simpara>以下のレコードは、アーカイブ名が "<literal>stable</literal>" で、 +リリースバージョン番号が "<literal>3.0</literal>" +となっているリリースに属するパッケージを、 +すべて高い優先度に割り当てます。</simpara> + +<programlisting> +Package: * +Pin: release a=stable, v=3.0 +Pin-Priority: 500 +</programlisting> +</listitem> +</itemizedlist> +</para> + +</refsect2> + +<refsect2> +<!-- +<title>How APT Interprets Priorities</title> +--> +<title>APT が優先度に割り込む方法</title> + +<para> +<!-- +Priorities (P) assigned in the APT preferences file must be positive +or negative integers. They are interpreted as follows (roughly speaking): +--> +APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。 +これは (おおざっぱにいうと) 以下のように解釈されます。 + +<variablelist> +<varlistentry> +<term>P > 1000</term> +<!-- +<listitem><simpara>causes a version to be installed even if this +constitutes a downgrade of the package</simpara></listitem> +--> +<listitem><simpara>パッケージがダウングレードしても、このバージョンのパッケージをインストールします。</simpara></listitem> +</varlistentry> +<varlistentry> +<term>990 < P <=1000</term> +<!-- +<listitem><simpara>causes a version to be installed +even if it does not come from the target release, +unless the installed version is more recent</simpara></listitem> +--> +<listitem><simpara>インストールされているバージョンの方が新しいことを除き、 +ターゲットリリースに含まれなくても、 +このバージョンのパッケージをインストールします。</simpara></listitem> +</varlistentry> +<varlistentry> +<term>500 < P <=990</term> +<!-- +<listitem><simpara>causes a version to be installed +unless there is a version available belonging to the target release +or the installed version is more recent</simpara></listitem> +--> +<listitem><simpara>ターゲットリリースに属するバージョンがあったり、 +インストールされているバージョンの方が新しいのでなければ、 +このバージョンのパッケージをインストールします。</simpara></listitem> +</varlistentry> +<varlistentry> +<term>100 < P <=500</term> +<!-- +<listitem><simpara>causes a version to be installed +unless there is a version available belonging to some other +distribution or the installed version is more recent</simpara></listitem> +--> +<listitem><simpara>他のディストリビューションに属するバージョンがあったり、 +インストールされているバージョンの方が新しいのでなければ、 +このバージョンのパッケージをインストールします。</simpara></listitem> +</varlistentry> +<varlistentry> +<term>0 < P <=100</term> +<!-- +<listitem><simpara>causes a version to be installed +only if there is no installed version of the package</simpara></listitem> +--> +<listitem><simpara>このパッケージがインストールされていない場合、 +このバージョンのパッケージをインストールします。</simpara></listitem> +</varlistentry> +<varlistentry> +<term>P < 0</term> +<!-- +<listitem><simpara>prevents the version from being installed</simpara></listitem> +--> +<listitem><simpara>このバージョンがインストールされないようにします。</simpara></listitem> +</varlistentry> +</variablelist> +</para> + +<!-- +<para>If any specific-form records match an available package version then the +first such record determines the priority of the package version. +Failing that, +if any general-form records match an available package version then the +first such record determines the priority of the package version.</para> +--> +<para>特定形式のレコードが利用可能パッケージバージョンに一致した場合、 +最初のレコードが、パッケージバージョンの優先度を決定します。 +失敗して、汎用形式のレコードが利用可能パッケージバージョンに一致した場合、 +最初のレコードが、パッケージバージョンの優先度を決定します。</para> + +<!-- +<para>For example, suppose the APT preferences file contains the three +records presented earlier:</para> +--> +<para>例えば、APT 設定ファイルの上の方に、 +以下のレコードが書かれていると仮定してください。</para> + +<programlisting> +Package: perl +Pin: version 5.8* +Pin-Priority: 1001 + +Package: * +Pin: origin "" +Pin-Priority: 999 + +Package: * +Pin: release unstable +Pin-Priority: 50 +</programlisting> + +<!-- +<para>Then: +--> +<para>すると、 +<itemizedlist> +<!-- +<listitem><simpara>The most recent available version of the <literal>perl</literal> +package will be installed, so long as that version's version number begins +with "<literal>5.8</literal>". If <emphasis>any</emphasis> 5.8* version of <literal>perl</literal> is +available and the installed version is 5.9*, then <literal>perl</literal> will be +downgraded.</simpara></listitem> +--> +<listitem><simpara>バージョン番号が "<literal>5.8</literal>" で始まっていれば、 +<literal>perl</literal> の最新の利用可能パッケージがインストールされます。 +バージョン 5.8* が利用可能で、バージョン 5.9* がインストールされている場合、 +<literal>perl</literal> はダウングレードされます。</simpara></listitem> +<!-- +<listitem><simpara>A version of any package other than <literal>perl</literal> +that is available from the local system has priority over other versions, +even versions belonging to the target release. +</simpara></listitem> +--> +<listitem><simpara>ローカルシステムで有効な、 +<literal>perl</literal> 以外のどんなパッケージでも、 +他のバージョンより (たとえターゲットリリースに属していても) 優先度が高くなります。 +</simpara></listitem> +<!-- +<listitem><simpara>A version of a package whose origin is not the local +system but some other site listed in &sources-list; and which belongs to +an <literal>unstable</literal> distribution is only installed if it is selected +for installation and no version of the package is already installed. +</simpara></listitem> +--> +<listitem><simpara>ローカルシステムにはなくても &sources-list; +に列挙されたサイトにあるバージョンで、 +<literal>unstable</literal> ディストリビューションに属しているパッケージは、 +インストールするよう選択され、 +既にインストールされているバージョンがない場合にのみインストールされます。 +</simpara></listitem> +</itemizedlist> +</para> +</refsect2> + +<refsect2> +<!-- +<title>Determination of Package Version and Distribution Properties</title> +--> +<title>パッケージのバージョンとディストリビューションプロパティの決定</title> + +<!-- +<para>The locations listed in the &sources-list; file should provide +<filename>Packages</filename> and <filename>Release</filename> files +to describe the packages available at that location. </para> +--> +<para>&sources-list; ファイルに列挙した場所では、 +その場所で利用できるパッケージを記述した、 +<filename>Packages</filename> ファイルや +<filename>Release</filename> ファイルを提供します。</para> + +<!-- +<para>The <filename>Packages</filename> file is normally found in the directory +<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: +for example, <filename>.../dists/stable/main/binary-i386/Packages</filename>. +It consists of a series of multi-line records, one for each package available +in that directory. Only two lines in each record are relevant for setting +APT priorities: +--> +<para><filename>Packages</filename> ファイルは通常 +<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename> +ディレクトリにあります。 +例えば、<filename>.../dists/stable/main/binary-i386/Packages</filename> です。 +これは、ディレクトリにある利用可能パッケージごとに、 +複数行のレコードからできています。 +APT 優先度の設定は、レコードごとに以下の 2 行だけです。 +<variablelist> +<varlistentry> +<!-- +<term>the <literal>Package:</literal> line</term> +<listitem><simpara>gives the package name</simpara></listitem> +--> +<term><literal>Package:</literal> 行</term> +<listitem><simpara>パッケージ名を与えます。</simpara></listitem> +</varlistentry> +<varlistentry> +<!-- +<term>the <literal>Version:</literal> line</term> +<listitem><simpara>gives the version number for the named package</simpara></listitem> +--> +<term><literal>Version:</literal> 行</term> +<listitem><simpara>その名前のパッケージのバージョン番号を与えます。</simpara></listitem> +</varlistentry> +</variablelist> +</para> + +<!-- +<para>The <filename>Release</filename> file is normally found in the directory +<filename>.../dists/<replaceable>dist-name</replaceable></filename>: +for example, <filename>.../dists/stable/Release</filename>, +or <filename>.../dists/woody/Release</filename>. +It consists of a single multi-line record which applies to <emphasis>all</emphasis> of +the packages in the directory tree below its parent. Unlike the +<filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename> +file are relevant for setting APT priorities: +--> +<para><filename>Release</filename> ファイルは、通常 +<filename>.../dists/<replaceable>dist-name</replaceable></filename> +にあります。例えば、 +<filename>.../dists/stable/Release</filename>, +<filename>.../dists/woody/Release</filename> です。 +これは、このディレクトリ以下にある<emphasis>全</emphasis>パッケージに適用する、 +複数行のレコード 1 つから成っています。 +<filename>Packages</filename> と違い <filename>Release</filename> ファイルは、 +ほとんどの行が APT 優先度の設定に関連します。 + +<variablelist> +<varlistentry> +<!-- +<term>the <literal>Archive:</literal> line</term> +--> +<term><literal>Archive:</literal> 行</term> +<!-- +<listitem><simpara>names the archive to which all the packages +in the directory tree belong. For example, the line +"Archive: stable" +specifies that all of the packages in the directory +tree below the parent of the <filename>Release</filename> file are in a +<literal>stable</literal> archive. Specifying this value in the APT preferences file +would require the line: +--> +<listitem><simpara>このディレクトリツリーに属する全パッケージのアーカイブ名。 +例えば、 +"Archive: stable" +という行は、<filename>Release</filename> ファイルの親ディレクトリツリー以下にある全パッケージが、 +<literal>stable</literal> アーカイブだと指定します。 +APT 設定ファイルでこの値を指定するには、以下の行が必要になります。 +</simpara> +<programlisting> +Pin: release a=stable +</programlisting> +</listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>the <literal>Version:</literal> line</term> +--> +<term><literal>Version:</literal> 行</term> +<!-- +<listitem><simpara>names the release version. For example, the +packages in the tree might belong to Debian GNU/Linux release +version 3.0. Note that there is normally no version number for the +<literal>testing</literal> and <literal>unstable</literal> distributions because they +have not been released yet. Specifying this in the APT preferences +file would require one of the following lines. +--> +<listitem><simpara>リリースバージョン名。 +例えば、このツリーのパッケージが、 +GNU/Linux リリースバージョン 3.0 に属するとします。 +通常 <literal>testing</literal> ディストリビューションや +<literal>unstable</literal> ディストリビューションには、 +まだリリースされていないので、バージョン番号が付きません。 +APT 設定ファイルでこれを指定するには、以下の行のいずれかが必要になります。 +</simpara> + +<programlisting> +Pin: release v=3.0 +Pin: release a=stable, v=3.0 +Pin: release 3.0 +</programlisting> + +</listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>the <literal>Component:</literal> line</term> +--> +<term><literal>Component:</literal> 行</term> +<!-- +<listitem><simpara>names the licensing component associated with the +packages in the directory tree of the <filename>Release</filename> file. +For example, the line "Component: main" specifies that +all the packages in the directory tree are from the <literal>main</literal> +component, which entails that they are licensed under terms listed +in the Debian Free Software Guidelines. Specifying this component +in the APT preferences file would require the line: +--> +<listitem><simpara><filename>Release</filename> ファイルの、 +ディレクトリツリーにあるパッケージのライセンスコンポーネント名。 +例えば、"Component: main" という行は、このディレクトリ以下の全ファイルが、 +<literal>main</literal> コンポーネント +(Debian フリーソフトウェアガイドラインの元でライセンスされている) +であることを表します。 +APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必要になります。 +</simpara> +<programlisting> +Pin: release c=main +</programlisting> +</listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>the <literal>Origin:</literal> line</term> +--> +<term><literal>Origin:</literal> 行</term> +<!-- +<listitem><simpara>names the originator of the packages in the +directory tree of the <filename>Release</filename> file. Most commonly, this is +<literal>Debian</literal>. Specifying this origin in the APT preferences file +would require the line: +--> +<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提供者名。 +ほとんど共通で、<literal>Debian</literal> です。 +APT 設定ファイルでこの提供者を指定するには、以下の行が必要になります。 +</simpara> +<programlisting> +Pin: release o=Debian +</programlisting> +</listitem> +</varlistentry> + +<varlistentry> +<!-- +<term>the <literal>Label:</literal> line</term> +--> +<term><literal>Label:</literal> 行</term> +<!-- +<listitem><simpara>names the label of the packages in the directory tree +of the <filename>Release</filename> file. Most commonly, this is +<literal>Debian</literal>. Specifying this label in the APT preferences file +would require the line: +--> +<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラベル名。 +ほとんど共通で <literal>Debian</literal> です。 +APT 設定ファイルでこのラベルを指定するには、以下の行が必要になります。 +</simpara> +<programlisting> +Pin: release l=Debian +</programlisting> +</listitem> +</varlistentry> +</variablelist> +</para> + +<!-- +<para>All of the <filename>Packages</filename> and <filename>Release</filename> +files retrieved from locations listed in the &sources-list; file are stored +in the directory <filename>/var/lib/apt/lists</filename>, or in the file named +by the variable <literal>Dir::State::Lists</literal> in the <filename>apt.conf</filename> file. +For example, the file +<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> +contains the <filename>Release</filename> file retrieved from the site +<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> architecture +files from the <literal>contrib</literal> component of the <literal>unstable</literal> +distribution.</para> +--> +<para>&sources-list; ファイルに列挙された場所から取得した +<filename>Packages</filename> ファイルや +<filename>Release</filename> ファイルはすべて、 +<filename>/var/lib/apt/lists</filename> ディレクトリや、 +<filename>apt.conf</filename> ファイルの +<literal>Dir::State::Lists</literal> 変数で指定した場所に取得されます。例えば、 +<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルは、 +<literal>debian.lcs.mit.edu</literal> から取得した、 +<literal>unstable</literal> ディストリビューションで、 +<literal>contrib</literal> コンポーネントな、 +<literal>binary-i386</literal> アーキテクチャ用の +<filename>Release</filename> ファイルを含んでいます。</para> +</refsect2> + +<refsect2> +<!-- +<title>Optional Lines in an APT Preferences Record</title> +--> +<title>APT 設定レコードのオプション行</title> + +<!-- +<para>Each record in the APT preferences file can optionally begin with +one or more lines beginning with the word <literal>Explanation:</literal>. +This provides a place for comments.</para> +--> +<para>APT 設定ファイルのレコードごとに、 +任意で <literal>Explanation:</literal> で始まる行を持てます。 +これは、コメント用の場所を確保します。</para> + +<!-- +<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is +optional. If omitted, APT assigs a priority of 1 less than the last value +specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para> +--> +<para>APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。 +省略すると、<literal>Pin-Priority: release ...</literal> +で始まる行で指示した最後の値 (少なくとも1つ) を優先度に割り当てます。</para> +</refsect2> +</refsect1> + +<refsect1> +<!-- +<title>Examples</title> +--> +<title>サンプル</title> +<refsect2> +<!-- +<title>Tracking Stable</title> +--> +<title>安定版を追跡</title> + +<!-- +<para>The following APT preferences file will cause APT to assign a +priority higher than the default (500) to all package versions belonging +to a <literal>stable</literal> distribution and a prohibitively low priority to +package versions belonging to other <literal>Debian</literal> distributions. +--> +<para>以下の APT 設定ファイルは、<literal>stable</literal> +ディストリビューションに属する全てのパッケージのバージョンに、 +デフォルト (500) より高い優先度を割り当て、 +他の <literal>Debian</literal> +ディストリビューションのパッケージのバージョンには、 +低くてインストールできないような優先度を割り当てます。 + +<programlisting> +Explanation: Uninstall or do not install any Debian-originated +Explanation: package versions other than those in the stable distro +Package: * +Pin: release a=stable +Pin-Priority: 900 + +Package: * +Pin: release o=Debian +Pin-Priority: -10 +</programlisting> +</para> + +<!-- +<para>With a suitable &sources-list; file and the above preferences file, +any of the following commands will cause APT to upgrade to the +latest <literal>stable</literal> version(s). +--> +<para>適切な &sources-list; ファイルと上記の設定ファイルにより、 +以下のコマンドで最新の <literal>stable</literal> +バージョンにアップグレードできます。 + +<programlisting> +apt-get install <replaceable>package-name</replaceable> +apt-get upgrade +apt-get dist-upgrade +</programlisting> +</para> + +<!-- +<para>The following command will cause APT to upgrade the specified +package to the latest version from the <literal>testing</literal> distribution; +the package will not be upgraded again unless this command is given +again. +--> +<para>以下のコマンドで、指定したパッケージを <literal>testing</literal> +ディストリビューションの最新バージョンにアップグレードします。 +このパッケージは、再度このコマンドを発行しないとアップグレードされません。 + +<programlisting> +apt-get install <replaceable>package</replaceable>/testing +</programlisting> +</para> +</refsect2> + + <refsect2> +<!-- + <title>Tracking Testing or Unstable</title> +--> + <title>テスト版や不安定版を追跡</title> + +<!-- +<para>The following APT preferences file will cause APT to assign +a high priority to package versions from the <literal>testing</literal> +distribution, a lower priority to package versions from the +<literal>unstable</literal> distribution, and a prohibitively low priority +to package versions from other <literal>Debian</literal> distributions. +--> +<para>以下の APT 設定ファイルは、<literal>testing</literal> +ディストリビューションのパッケージのバージョンに高い優先度を割り当て、 +<literal>unstable</literal> +ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。 +また他の <literal>Debian</literal> +ディストリビューションのパッケージのバージョンには、 +低くてインストールできないような優先度を割り当てます。 + +<programlisting> +Package: * +Pin: release a=testing +Pin-Priority: 900 + +Package: * +Pin: release a=unstable +Pin-Priority: 800 + +Package: * +Pin: release o=Debian +Pin-Priority: -10 +</programlisting> +</para> + +<!-- +<para>With a suitable &sources-list; file and the above preferences file, +any of the following commands will cause APT to upgrade to the latest +<literal>testing</literal> version(s). +--> +<para>適切な &sources-list; ファイルと上記の設定ファイルにより、 +以下のコマンドで最新の <literal>testing</literal> +バージョンにアップグレードできます。 + +<programlisting> +apt-get install <replaceable>package-name</replaceable> +apt-get upgrade +apt-get dist-upgrade +</programlisting> +</para> + +<!-- +<para>The following command will cause APT to upgrade the specified +package to the latest version from the <literal>unstable</literal> distribution. +Thereafter, <command>apt-get upgrade</command> will upgrade +the package to the most recent <literal>testing</literal> version if that is +more recent than the installed version, otherwise, to the most recent +<literal>unstable</literal> version if that is more recent than the installed +version. +--> +<para>以下のコマンドで、指定したパッケージを <literal>unstable</literal> +ディストリビューションの最新バージョンにアップグレードします。 +それ以降、<command>apt-get upgrade</command> は +<literal>testing</literal> バージョンのパッケージが更新されていれば +<literal>testing</literal> の最新版に、 +<literal>unstable</literal> バージョンのパッケージが更新されていれば +<literal>unstable</literal>の最新版にアップグレードします。 + +<programlisting> +apt-get install <replaceable>package</replaceable>/unstable +</programlisting> +</para> + +</refsect2> +</refsect1> + +<refsect1> +<!-- +<title>See Also</title> +--> +<title>関連項目</title> +<para>&apt-get; &apt-cache; &apt-conf; &sources-list; +</para> +</refsect1> + + &manbugs; + &translator; + +</refentry> + diff --git a/doc/ja/makefile b/doc/ja/makefile index 9e757b590..286152995 100644 --- a/doc/ja/makefile +++ b/doc/ja/makefile @@ -5,7 +5,59 @@ SUBDIR=doc/ja # Bring in the default rules include ../../buildlib/defaults.mak +# Do not use XMLTO, build the manpages directly with XSLTPROC +XSLTPROC=/usr/bin/xsltproc +STYLESHEET=./style.ja.xsl + + # Man pages -SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 +SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \ + sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \ + apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \ + apt-key.ja.8 apt-secure.ja.8 + INCLUDES = apt.ent.ja -include $(SGML_MANPAGE_H) + +doc: $(SOURCE) + +$(SOURCE) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XSLTPROC) -o $@ $(STYLESHEET) $< + +apt-cache.ja.8:: apt-cache.8 + cp $< $@ + +apt-get.ja.8:: apt-get.8 + cp $< $@ + +apt-cdrom.ja.8:: apt-cdrom.8 + cp $< $@ + +apt.conf.ja.5:: apt.conf.5 + cp $< $@ + +apt-config.ja.8:: apt-config.8 + cp $< $@ + +sources.list.ja.5:: sources.list.5 + cp $< $@ + +apt-sortpkgs.ja.1:: apt-sortpkgs.1 + cp $< $@ + +apt-ftparchive.ja.1:: apt-ftparchive.1 + cp $< $@ + +apt_preferences.ja.5:: apt_preferences.5 + cp $< $@ + +apt-extracttemplates.ja.1:: apt-extracttemplates.1 + cp $< $@ + +apt-key.ja.8:: apt-key.8 + cp $< $@ + +apt-secure.ja.8:: apt-secure.8 + cp $< $@ + + diff --git a/doc/ja/manpage.links b/doc/ja/manpage.links new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/doc/ja/manpage.links diff --git a/doc/ja/manpage.refs b/doc/ja/manpage.refs new file mode 100644 index 000000000..16ffc791b --- /dev/null +++ b/doc/ja/manpage.refs @@ -0,0 +1,4 @@ +{ + '' => '', + '' => '' +} diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml new file mode 100644 index 000000000..e000d8767 --- /dev/null +++ b/doc/ja/sources.list.ja.5.xml @@ -0,0 +1,427 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.ja"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + + <refmeta> + <refentrytitle>sources.list</refentrytitle> + <manvolnum>5</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>sources.list</refname> +<!-- + <refpurpose>Package resource list for APT</refpurpose> +--> + <refpurpose>APT 用パッケージリソースリスト</refpurpose> + </refnamediv> + +<!-- + <refsect1><title>Description</title> + --> + <refsect1><title>説明</title> +<!-- + <para>The package resource list is used to locate archives of the package + distribution system in use on the system. At this time, this manual page + documents only the packaging system used by the Debian GNU/Linux system. + This control file is located in <filename>/etc/apt/sources.list</filename></para> +--> + <para>このパッケージリソースリストは、 + システムで使用するパッケージの保管場所を特定するのに使用されます。 + 今回このマニュアルページには、 + Debian GNU/Linux システムで使用するパッケージシステムについてのみ記述します。 + この制御ファイルは、<filename>/etc/apt/sources.list</filename> にあります。</para> + +<!-- + <para>The source list is designed to support any number of active sources and a + variety of source media. The file lists one source per line, with the + most preferred source listed first. The format of each line is: + <literal>type uri args</literal> The first item, <literal>type</literal> + determines the format for <literal>args</literal> <literal>uri</literal> is + a Universal Resource Identifier + (URI), which is a superset of the more specific and well-known Universal + Resource Locator, or URL. The rest of the line can be marked as a comment + by using a #.</para> +--> + <para>ソースリストは複数の有効な取得元と、 + 様々な取得メディアをサポートしています。 + ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。 + 行のフォーマットは、<literal>タイプ uri 引数</literal> となります。 + 先頭の <literal>タイプ</literal> で、 + <literal>引数</literal> のフォーマットを決定します。 + <literal>uri</literal> は Universal Resource Identifier (URI) で、 + よく知られた URL のスーパーセットです。 + 行の残りに # を付けて、コメントにできます。</para> + </refsect1> + + <refsect1><title>sources.list.d</title> +<!-- + <para>The <filename>/etc/apt/sources.list.d</filename> directory provides + a way to add sources.list entries in seperate files that end with + <literal>.list</literal>. The format is the same as for the regular + <filename>sources.list</filename> file. </para> +--> + <para><filename>/etc/apt/sources.list.d</filename> ディレクトリに + ファイル名が <literal>.list</literal> で終わる個別ファイルを置いておくと、 + sources.list エントリに追加できます。フォーマットは、 + 通常の <filename>sources.list</filename> ファイルと同じです。</para> + </refsect1> + +<!-- + <refsect1><title>The deb and deb-src types</title> +--> + <refsect1><title>deb タイプと deb-src タイプ</title> +<!-- + <para>The <literal>deb</literal> type describes a typical two-level Debian + archive, <filename>distribution/component</filename>. Typically, + <literal>distribution</literal> is generally one of + <literal>stable</literal> <literal>unstable</literal> or + <literal>testing</literal> while component is one of <literal>main</literal> + <literal>contrib</literal> <literal>non-free</literal> or + <literal>non-us</literal> The + <literal>deb-src</literal> type describes a debian distribution's source + code in the same form as the <literal>deb</literal> type. + A <literal>deb-src</literal> line is required to fetch source indexes.</para> +--> + <para><literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ + (<filename>distribution/component</filename>) を記述します。 + よくあるケースでは、<literal>distribution</literal> は通常 + <literal>stable</literal> <literal>unstable</literal> + <literal>testing</literal> のどれか、 + component は、<literal>main</literal> <literal>contrib</literal> + <literal>non-free</literal> <literal>non-us</literal> のどれかです。 + <literal>deb-src</literal> タイプでは、 + Debian ディストリビューションのソースコードを、 + <literal>deb</literal> タイプと同じ形式で記述します。 + <literal>deb-src</literal> 行は、 + ソースインデックスを取得するのに必要です。</para> + +<!-- + <para>The format for a <filename>sources.list</filename> entry using the + <literal>deb</literal> and <literal>deb-src</literal> types are:</para> +--> + <para><literal>deb</literal> タイプと <literal>deb-src</literal> + タイプで使用する <filename>sources.list</filename> + エントリのフォーマットは、以下になります。</para> + + <literallayout>deb uri distribution [component1] [component2] [...]</literallayout> + +<!-- + <para>The URI for the <literal>deb</literal> type must specify the base of the + Debian distribution, from which APT will find the information it needs. + <literal>distribution</literal> can specify an exact path, in which case the + components must be omitted and <literal>distribution</literal> must end with + a slash (/). This is useful for when only a particular sub-section of the + archive denoted by the URI is of interest. + If <literal>distribution</literal> does not specify an exact path, at least + one <literal>component</literal> must be present.</para> +--> + <para><literal>deb</literal> タイプの URI は、 + APT が情報を見つけられるように、 + Debian ディストリビューションの基底を指定しなければなりません。 + <literal>distribution</literal> には正確なパスを指定できます。 + その場合 component を省略し、<literal>distribution</literal> + はスラッシュ (/) で終わらなくてはなりません。 + これは URL で指定されたアーカイブの、 + 特定のサブセクションのみに関心があるときに役に立ちます。 + <literal>distribution</literal> に正確なパスを指定しないのなら、 + 少なくともひとつは <literal>component</literal> を指定しなければなりません。</para> + +<!-- + <para><literal>distribution</literal> may also contain a variable, + <literal>$(ARCH)</literal> + which expands to the Debian architecture (i386, m68k, powerpc, ...) + used on the system. This permits architecture-independent + <filename>sources.list</filename> files to be used. In general this is only + of interest when specifying an exact path, <literal>APT</literal> will + automatically generate a URI with the current architecture otherwise.</para> +--> + <para><literal>distribution</literal> は、 + <literal>$(ARCH)</literal> 変数を含む場合があります。 + <literal>$(ARCH)</literal> 変数は、システムで使用している + Debian アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。 + これにより、アーキテクチャに依存しない <filename>sources.list</filename> + ファイルを使用できます。 + 一般的に、これは正しいパスを指定するときに気にするだけです。 + そうでない場合は、<literal>APT</literal> は現在のアーキテクチャで URI + を自動的に生成します。</para> + +<!-- + <para>Since only one distribution can be specified per line it may be necessary + to have multiple lines for the same URI, if a subset of all available + distributions or components at that location is desired. + APT will sort the URI list after it has generated a complete set + internally, and will collapse multiple references to the same Internet + host, for instance, into a single connection, so that it does not + inefficiently establish an FTP connection, close it, do something else, + and then re-establish a connection to that same host. This feature is + useful for accessing busy FTP sites with limits on the number of + simultaneous anonymous users. APT also parallelizes connections to + different hosts to more effectively deal with sites with low bandwidth.</para> +--> + <para>有効な全 distribution, component の場所から、 + 一部が必要な場合、1 行につき 1 distribution しか指定できないため、 + 同じ URI の行を複数記述することになるでしょう。 + APT は内部で URI リストを生成してから、並べ替えます。 + そして、同じインターネットホストに対しては複数の参照をまとめます。 + 例えば FTP 接続後、切断してからまた同じホストに再接続するといった、 + 効率の悪いことをせずに、1 接続にまとめます。 + この機能は、同時接続匿名ユーザ数を制限している、 + 混んでいる FTP サイトにアクセスするのに便利です。 + APT は、帯域の狭いサイトを効率よく扱うのに、 + 異なるホストへは、接続を並行して行うようにもしています。</para> + +<!-- + <para>It is important to list sources in order of preference, with the most + preferred source listed first. Typically this will result in sorting + by speed from fastest to slowest (CD-ROM followed by hosts on a local + network, followed by distant Internet hosts, for example).</para> +--> + <para>最優先する取得元を最初に記述するというように、 + 優先順に取得元を記述するのは重要です。 + 一般的には、スピードの速い順に並べることになる + (例えば、CD-ROM に続いてローカルネットワークのホスト、 + さらに続いて彼方のインターネットホスト) でしょう。</para> + +<!-- + <para>Some examples:</para> +--> + <para>例:</para> + <literallayout> +deb http://http.us.debian.org/debian stable main contrib non-free +deb http://http.us.debian.org/debian dists/stable-updates/ + </literallayout> + + </refsect1> + +<!-- + <refsect1><title>URI specification</title> +--> + <refsect1><title>URI の仕様</title> + +<!-- + <para>The currently recognized URI types are cdrom, file, http, and ftp. +--> + <para>現在認識する URI 対応は、cdrom, file, http, ftp です。 + <variablelist> + <varlistentry><term>file</term> +<!-- + <listitem><para> + The file scheme allows an arbitrary directory in the file system to be + considered an archive. This is useful for NFS mounts and local mirrors or + archives.</para></listitem> +--> + <listitem><para> + file スキームは、システム内の任意のディレクトリを、 + アーカイブとして扱えるようにします。 + これは NFS マウントやローカルミラーで便利です。</para></listitem> + </varlistentry> + + <varlistentry><term>cdrom</term> +<!-- + <listitem><para> + The cdrom scheme allows APT to use a local CDROM drive with media + swapping. Use the &apt-cdrom; program to create cdrom entries in the + source list.</para></listitem> +--> + <listitem><para> + cdrom スキームは、APT がローカル CD-ROM ドライブを、 + メディア交換しながら使えるようにします。 + 取得元リストに cdrom エントリを追加するには、 + &apt-cdrom; プログラムを使用してください。</para></listitem> + </varlistentry> + + <varlistentry><term>http</term> +<!-- + <listitem><para> + The http scheme specifies an HTTP server for the archive. If an environment + variable <envar>http_proxy</envar> is set with the format + http://server:port/, the proxy server specified in + <envar>http_proxy</envar> will be used. Users of authenticated + HTTP/1.1 proxies may use a string of the format + http://user:pass@server:port/ + Note that this is an insecure method of authentication.</para></listitem> +--> + <listitem><para> + http スキームはアーカイブとして、HTTP サーバを指定します。 + 環境変数 <envar>http_proxy</envar> が、 + http://server:port/ と言った形で指定されていれば、 + <envar>http_proxy</envar> で指定した プロキシサーバを使用します。 + ユーザ認証が必要な HTTP/1.1 プロキシの場合、 + http://user:pass@server:port/ と言う形で指定してください。 + この認証方法は安全ではないことに注意してください。</para></listitem> + </varlistentry> + + <varlistentry><term>ftp</term> +<!-- + <listitem><para> + The ftp scheme specifies an FTP server for the archive. APT's FTP behavior + is highly configurable; for more information see the + &apt-conf; manual page. Please note that a ftp proxy can be specified + by using the <envar>ftp_proxy</envar> environment variable. It is possible + to specify a http proxy (http proxy servers often understand ftp urls) + using this method and ONLY this method. ftp proxies using http specified in + the configuration file will be ignored.</para></listitem> +--> + <listitem><para> + ftp スキームは、アーカイブに FTP サーバを指定します。 + APT の FTP の振る舞いは、高度に設定できます。 + 詳細は、&apt-conf; のマニュアルページをご覧ください。 + ftp プロキシは、 + <envar>ftp_proxy</envar> 環境変数で指定することにご注意ください。 + この方法用に、さらにこの方法でしか使用しないのに、 + http プロキシを使用することができます + (http プロキシサーバは大抵 ftp urlも理解できます)。 + 設定ファイルで http を使用する際に、 + ftp プロキシを使用するよう設定してあっても無視されます。</para></listitem> + </varlistentry> + + <varlistentry><term>copy</term> +<!-- + <listitem><para> + The copy scheme is identical to the file scheme except that packages are + copied into the cache directory instead of used directly at their location. + This is useful for people using a zip disk to copy files around with APT.</para></listitem> +--> + <listitem><para> + copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、 + キャッシュディレクトリにコピーするところが違います。 + zip ディスクを使用していて、APT でコピーを行う場合に便利です。</para></listitem> + </varlistentry> + + <varlistentry><term>rsh</term><term>ssh</term> +<!-- + <listitem><para> + The rsh/ssh method invokes rsh/ssh to connect to a remote host + as a given user and access the files. No password authentication is + possible, prior arrangements with RSA keys or rhosts must have been made. + Access to files on the remote uses standard <command>find</command> and + <command>dd</command> + commands to perform the file transfers from the remote.</para></listitem> +--> + <listitem><para> + rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、 + ファイルにアクセスするのに rsh/ssh を使用します。 + あらかじめ RSA キーや rhosts の配置が必要ですが、 + パスワードなし認証が可能です。 + リモートホストのファイルへのアクセスの際、 + ファイル転送に標準の <command>find</command> コマンドや + <command>dd</command> コマンドを使用します。</para></listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + +<!-- + <refsect1><title>Examples</title> +--> + <refsect1><title>サンプル</title> +<!-- + <para>Uses the archive stored locally (or NFS mounted) at /home/jason/debian + for stable/main, stable/contrib, and stable/non-free.</para> +--> + <para> /home/jason/debian に格納されている stable/main, stable/contrib, + stable/non-free 用のローカル (または NFS) アーカイブを使用します。</para> + <literallayout>deb file:/home/jason/debian stable main contrib non-free</literallayout> + +<!-- + <para>As above, except this uses the unstable (development) distribution.</para> +--> + <para>上記同様ですが、不安定版を使用します。</para> + <literallayout>deb file:/home/jason/debian unstable main contrib non-free</literallayout> + +<!-- + <para>Source line for the above</para> +--> + <para>上記のソース行</para> + <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout> + +<!-- + <para>Uses HTTP to access the archive at archive.debian.org, and uses only + the hamm/main area.</para> +--> + <para>archive.debian.org のアーカイブに HTTP アクセスし、 + hamm/main のみを使用します。</para> + <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout> + +<!-- + <para>Uses FTP to access the archive at ftp.debian.org, under the debian + directory, and uses only the stable/contrib area.</para> +--> + <para>ftp.debian.org のアーカイブに FTP アクセスし、 + debian ディレクトリ以下の stable/contrib のみを使用します。</para> + <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout> + +<!-- + <para>Uses FTP to access the archive at ftp.debian.org, under the debian + directory, and uses only the unstable/contrib area. If this line appears as + well as the one in the previous example in <filename>sources.list</filename>. + a single FTP session will be used for both resource lines.</para> +--> + <para>ftp.debian.org のアーカイブに FTP アクセスし、 + debian ディレクトリ以下の unstable/contrib を使用します。 + <filename>sources.list</filename> に上記サンプルと一緒に指定された場合、 + 両方のリソース行に対応する FTP セッションはひとつだけになります。</para> + <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout> + +<!-- + <para>Uses HTTP to access the archive at nonus.debian.org, under the + debian-non-US directory.</para> +--> + <para>nonus.debian.org のアーカイブに HTTP アクセスし、 + debian-non-US ディレクトリ以下を使用します。</para> + <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout> + +<!-- + <para>Uses HTTP to access the archive at nonus.debian.org, under the + debian-non-US directory, and uses only files found under + <filename>unstable/binary-i3866</filename> on i386 machines, + <filename>unstable/binary-m68k</filename> on m68k, and so + forth for other supported architectures. [Note this example only + illustrates how to use the substitution variable; non-us is no longer + structured like this] + <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout> + </para> +--> + <para>nonus.debian.org のアーカイブに HTTP アクセスし、 + debian-non-US ディレクトリ以下を使用します。 + また、i386 マシンでは <filename>unstable/binary-i386</filename> + 以下にあるファイル、 + m68k マシンでは <filename>unstable/binary-m68k</filename> + 以下にあるファイル、 + その他サポートするアーキテクチャごとのファイルのみ使用します。 + [このサンプルは変数展開の使用法の説明でしかないことに注意してください。 + non-us はこのような構造になっていません] + <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout> + </para> + </refsect1> + +<!-- + <refsect1><title>See Also</title> +--> + <refsect1><title>関連項目</title> + <para>&apt-cache; &apt-conf; + </para> + </refsect1> + + &manbugs; + &translator; + +</refentry> + diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl new file mode 100644 index 000000000..4af2d74cf --- /dev/null +++ b/doc/ja/style.ja.xsl @@ -0,0 +1,9 @@ +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0"> + +<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> + +<xsl:param name="chunker.output.encoding" select="'EUC-JP'" /> + +</xsl:stylesheet>
\ No newline at end of file diff --git a/doc/makefile b/doc/makefile index 31ee061fb..5f774b825 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,3 +42,24 @@ doc.ja: %.ja: doc.pl: %.pl: $(MAKE) -C pl $* + +ifdef DOXYGEN +DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) + +clean: doxygen-clean + +doxygen-clean: + rm -fr $(BUILD)/doc/doxygen + rm -f $(BUILD)/doc/doxygen-stamp + +$(BUILD)/doc/Doxyfile: Doxyfile.in + (cd $(BUILD) && ./config.status doc/Doxyfile) + +$(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile + rm -fr $(BUILD)/doc/doxygen + $(DOXYGEN) $(BUILD)/doc/Doxyfile + touch $(BUILD)/doc/doxygen-stamp + +doc: $(BUILD)/doc/doxygen-stamp + +endif diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bde9893bf..e47418b27 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -46,6 +46,13 @@ by using a #.</para> </refsect1> + <refsect1><title>sources.list.d</title> + <para>The <filename>/etc/apt/sources.list.d</filename> directory provides + a way to add sources.list entries in seperate files that end with + <literal>.list</literal>. The format is the same as for the regular + <filename>sources.list</filename> file. </para> + </refsect1> + <refsect1><title>The deb and deb-src types</title> <para>The <literal>deb</literal> type describes a typical two-level Debian archive, <filename>distribution/component</filename>. Typically, @@ -197,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ <para>Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US directory, and uses only files found under - <filename>unstable/binary-i3866</filename> on i386 machines, + <filename>unstable/binary-i386</filename> on i386 machines, <filename>unstable/binary-m68k</filename> on m68k, and so forth for other supported architectures. [Note this example only illustrates how to use the substitution variable; non-us is no longer diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 9e93dff05..0e6078642 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,6 +19,8 @@ #include <apti18n.h> #include <apt-pkg/error.h> #include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> @@ -54,7 +56,7 @@ bool CacheDB::ReadyDB(string DB) return true; db_create(&Dbp, NULL, 0); - if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_HASH, + if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_BTREE, (ReadOnly?DB_RDONLY:DB_CREATE), 0644)) != 0) { @@ -67,6 +69,12 @@ bool CacheDB::ReadyDB(string DB) (ReadOnly?DB_RDONLY:DB_CREATE), 0644); } + // the database format has changed from DB_HASH to DB_BTREE in + // apt 0.6.44 + if (err == EINVAL) + { + _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + } if (err) { Dbp = 0; @@ -79,48 +87,123 @@ bool CacheDB::ReadyDB(string DB) return true; } /*}}}*/ -// CacheDB::SetFile - Select a file to be working with /*{{{*/ +// CacheDB::OpenFile - Open the filei /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CacheDB::OpenFile() +{ + Fd = new FileFd(FileName,FileFd::ReadOnly); + if (_error->PendingError() == true) + { + delete Fd; + Fd = NULL; + return false; + } + return true; +} + /*}}}*/ +// CacheDB::GetFileStat - Get stats from the file /*{{{*/ +// --------------------------------------------------------------------- +/* This gets the size from the database if it's there. If we need + * to look at the file, also get the mtime from the file. */ +bool CacheDB::GetFileStat() +{ + if ((CurStat.Flags & FlSize) == FlSize) + { + /* Already worked out the file size */ + } + else + { + /* Get it from the file. */ + if (Fd == NULL && OpenFile() == false) + { + return false; + } + // Stat the file + struct stat St; + if (fstat(Fd->Fd(),&St) != 0) + { + return _error->Errno("fstat", + _("Failed to stat %s"),FileName.c_str()); + } + CurStat.FileSize = St.st_size; + CurStat.mtime = htonl(St.st_mtime); + CurStat.Flags |= FlSize; + } + return true; +} + /*}}}*/ +// CacheDB::GetCurStat - Set the CurStat variable. /*{{{*/ // --------------------------------------------------------------------- -/* All future actions will be performed against this file */ -bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd) +/* Sets the CurStat variable. Either to 0 if no database is used + * or to the value in the database if one is used */ +bool CacheDB::GetCurStat() { - delete DebFile; - DebFile = 0; - this->FileName = FileName; - this->Fd = Fd; - this->FileStat = St; - FileStat = St; memset(&CurStat,0,sizeof(CurStat)); - Stats.Bytes += St.st_size; - Stats.Packages++; - - if (DBLoaded == false) - return true; + if (DBLoaded) + { + /* First see if thre is anything about it + in the database */ + /* Get the flags (and mtime) */ InitQuery("st"); - // Ensure alignment of the returned structure Data.data = &CurStat; Data.ulen = sizeof(CurStat); Data.flags = DB_DBT_USERMEM; - // Lookup the stat info and confirm the file is unchanged - if (Get() == true) - { - if (CurStat.mtime != htonl(St.st_mtime)) + if (Get() == false) { - CurStat.mtime = htonl(St.st_mtime); CurStat.Flags = 0; - _error->Warning(_("File date has changed %s"),FileName.c_str()); } + CurStat.Flags = ntohl(CurStat.Flags); + CurStat.FileSize = ntohl(CurStat.FileSize); } - else + return true; +} + /*}}}*/ +// CacheDB::GetFileInfo - Get all the info about the file /*{{{*/ +// --------------------------------------------------------------------- +bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, + bool GenContentsOnly, + bool DoMD5, bool DoSHA1, bool DoSHA256) +{ + this->FileName = FileName; + + if (GetCurStat() == false) { - CurStat.mtime = htonl(St.st_mtime); - CurStat.Flags = 0; + return false; } - CurStat.Flags = ntohl(CurStat.Flags); OldStat = CurStat; + + if (GetFileStat() == false) + { + delete Fd; + Fd = NULL; + return false; + } + + Stats.Bytes += CurStat.FileSize; + Stats.Packages++; + + if (DoControl && LoadControl() == false + || DoContents && LoadContents(GenContentsOnly) == false + || DoMD5 && GetMD5(false) == false + || DoSHA1 && GetSHA1(false) == false + || DoSHA256 && GetSHA256(false) == false) + { + delete Fd; + Fd = NULL; + delete DebFile; + DebFile = NULL; + return false; + } + + delete Fd; + Fd = NULL; + delete DebFile; + DebFile = NULL; + return true; } /*}}}*/ @@ -139,6 +222,10 @@ bool CacheDB::LoadControl() CurStat.Flags &= ~FlControl; } + if (Fd == NULL && OpenFile() == false) + { + return false; + } // Create a deb instance to read the archive if (DebFile == 0) { @@ -183,6 +270,10 @@ bool CacheDB::LoadContents(bool GenOnly) CurStat.Flags &= ~FlContents; } + if (Fd == NULL && OpenFile() == false) + { + return false; + } // Create a deb instance to read the archive if (DebFile == 0) { @@ -201,10 +292,37 @@ bool CacheDB::LoadContents(bool GenOnly) return true; } /*}}}*/ + +static string bytes2hex(uint8_t *bytes, size_t length) { + char space[65]; + if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2; + for (size_t i = 0; i < length; i++) + snprintf(&space[i*2], 3, "%02x", bytes[i]); + return string(space); +} + +static inline unsigned char xdig2num(char dig) { + if (isdigit(dig)) return dig - '0'; + if ('a' <= dig && dig <= 'f') return dig - 'a' + 10; + if ('A' <= dig && dig <= 'F') return dig - 'A' + 10; + return 0; +} + +static void hex2bytes(uint8_t *bytes, const char *hex, int length) { + while (length-- > 0) { + *bytes = 0; + if (isxdigit(hex[0]) && isxdigit(hex[1])) { + *bytes = xdig2num(hex[0]) * 16 + xdig2num(hex[1]); + hex += 2; + } + bytes++; + } +} + // CacheDB::GetMD5 - Get the MD5 hash /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::GetMD5(string &MD5Res,bool GenOnly) +bool CacheDB::GetMD5(bool GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlMD5) == FlMD5) @@ -212,28 +330,88 @@ bool CacheDB::GetMD5(string &MD5Res,bool GenOnly) if (GenOnly == true) return true; - InitQuery("m5"); - if (Get() == true) - { - MD5Res = string((char *)Data.data,Data.size); + MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5)); return true; } - CurStat.Flags &= ~FlMD5; - } - Stats.MD5Bytes += FileStat.st_size; + Stats.MD5Bytes += CurStat.FileSize; + if (Fd == NULL && OpenFile() == false) + { + return false; + } MD5Summation MD5; - if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),FileStat.st_size) == false) + if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false) return false; MD5Res = MD5.Result(); - InitQuery("m5"); - if (Put(MD5Res.c_str(),MD5Res.length()) == true) + hex2bytes(CurStat.MD5, MD5Res.data(), sizeof(CurStat.MD5)); CurStat.Flags |= FlMD5; return true; } /*}}}*/ +// CacheDB::GetSHA1 - Get the SHA1 hash /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CacheDB::GetSHA1(bool GenOnly) +{ + // Try to read the control information out of the DB. + if ((CurStat.Flags & FlSHA1) == FlSHA1) + { + if (GenOnly == true) + return true; + + SHA1Res = bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1)); + return true; + } + + Stats.SHA1Bytes += CurStat.FileSize; + + if (Fd == NULL && OpenFile() == false) + { + return false; + } + SHA1Summation SHA1; + if (Fd->Seek(0) == false || SHA1.AddFD(Fd->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 GenOnly) +{ + // Try to read the control information out of the DB. + if ((CurStat.Flags & FlSHA256) == FlSHA256) + { + if (GenOnly == true) + return true; + + SHA256Res = bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256)); + return true; + } + + Stats.SHA256Bytes += CurStat.FileSize; + + if (Fd == NULL && OpenFile() == false) + { + return false; + } + SHA256Summation SHA256; + if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false) + return false; + + SHA256Res = SHA256.Result(); + hex2bytes(CurStat.SHA256, SHA256Res.data(), sizeof(CurStat.SHA256)); + CurStat.Flags |= FlSHA256; + return true; +} + /*}}}*/ // CacheDB::Finish - Write back the cache structure /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -246,9 +424,12 @@ bool CacheDB::Finish() // Write the stat information CurStat.Flags = htonl(CurStat.Flags); + CurStat.FileSize = htonl(CurStat.FileSize); InitQuery("st"); Put(&CurStat,sizeof(CurStat)); CurStat.Flags = ntohl(CurStat.Flags); + CurStat.FileSize = ntohl(CurStat.FileSize); + return true; } /*}}}*/ @@ -278,7 +459,6 @@ bool CacheDB::Clean() { if (stringcmp((char *)Key.data,Colon,"st") == 0 || stringcmp((char *)Key.data,Colon,"cn") == 0 || - stringcmp((char *)Key.data,Colon,"m5") == 0 || stringcmp((char *)Key.data,Colon,"cl") == 0) { if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true) diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 1b043e1aa..afa22213a 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -44,7 +44,7 @@ class CacheDB memset(&Key,0,sizeof(Key)); memset(&Data,0,sizeof(Data)); Key.data = TmpKey; - Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",Type,FileName.c_str()); + Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type); } inline bool Get() @@ -64,19 +64,31 @@ class CacheDB } return true; } + bool OpenFile(); + bool GetFileStat(); + bool GetCurStat(); + bool LoadControl(); + bool LoadContents(bool GenOnly); + bool GetMD5(bool GenOnly); + bool GetSHA1(bool GenOnly); + bool GetSHA256(bool GenOnly); // 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)}; + enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2), + FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)}; struct StatStore { - time_t mtime; uint32_t Flags; + uint32_t mtime; + uint32_t FileSize; + uint8_t MD5[16]; + uint8_t SHA1[20]; + uint8_t SHA256[32]; } CurStat; struct StatStore OldStat; // 'set' state string FileName; - struct stat FileStat; FileFd *Fd; debDebFile *DebFile; @@ -85,34 +97,42 @@ class CacheDB // Data collection helpers debDebFile::MemControlExtract Control; ContentsExtract Contents; + string MD5Res; + string SHA1Res; + string SHA256Res; // Runtime statistics struct Stats { double Bytes; double MD5Bytes; + double SHA1Bytes; + double SHA256Bytes; unsigned long Packages; unsigned long Misses; unsigned long DeLinkBytes; - inline void Add(const Stats &S) {Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; + inline void Add(const Stats &S) { + Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; + SHA256Bytes += S.SHA256Bytes; Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;}; - Stats() : Bytes(0), MD5Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; + Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; } Stats; bool ReadyDB(string DB); inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;}; inline bool Loaded() {return DBLoaded == true;}; + inline off_t GetFileSize(void) {return CurStat.FileSize;} + bool SetFile(string FileName,struct stat St,FileFd *Fd); - bool LoadControl(); - bool LoadContents(bool GenOnly); - bool GetMD5(string &MD5Res,bool GenOnly); + bool GetFileInfo(string FileName, bool DoControl, bool DoContents, + bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256); bool Finish(); bool Clean(); - CacheDB(string DB) : Dbp(0), DebFile(0) {ReadyDB(DB);}; + CacheDB(string DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);}; ~CacheDB() {ReadyDB(string()); delete DebFile;}; }; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index fc9ea27d7..ea242d6af 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -23,6 +23,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <apt-pkg/deblistparser.h> #include <sys/types.h> @@ -70,7 +71,7 @@ FTWScanner::FTWScanner() // --------------------------------------------------------------------- /* This is the FTW scanner, it processes each directory element in the directory tree. */ -int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) +int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag) { if (Flag == FTW_DNR) { @@ -85,6 +86,14 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) if (Flag != FTW_F) return 0; + return ScannerFile(File, true); +} + /*}}}*/ +// FTWScanner::ScannerFile - File Scanner /*{{{*/ +// --------------------------------------------------------------------- +/* */ +int FTWScanner::ScannerFile(const char *File, bool ReadLink) +{ const char *LastComponent = strrchr(File, '/'); if (LastComponent == NULL) LastComponent = File; @@ -105,7 +114,8 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) given are not links themselves. */ char Jnk[2]; Owner->OriginalPath = File; - if (Owner->RealPath != 0 && readlink(File,Jnk,sizeof(Jnk)) != -1 && + if (ReadLink && Owner->RealPath != 0 && + readlink(File,Jnk,sizeof(Jnk)) != -1 && realpath(File,Owner->RealPath) != 0) Owner->DoPackage(Owner->RealPath); else @@ -154,7 +164,7 @@ bool FTWScanner::RecursiveScan(string Dir) // Do recursive directory searching Owner = this; - int Res = ftw(Dir.c_str(),Scanner,30); + int Res = ftw(Dir.c_str(),ScannerFTW,30); // Error treewalking? if (Res != 0) @@ -209,12 +219,14 @@ bool FTWScanner::LoadFileList(string Dir,string File) FileName = Line; } +#if 0 struct stat St; int Flag = FTW_F; if (stat(FileName,&St) != 0) Flag = FTW_NS; +#endif - if (Scanner(FileName,&St,Flag) != 0) + if (ScannerFile(FileName, false) != 0) break; } @@ -227,7 +239,7 @@ bool FTWScanner::LoadFileList(string Dir,string File) /* */ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, unsigned long &DeLinkBytes, - struct stat &St) + off_t FileSize) { // See if this isn't an internaly prefix'd file name. if (InternalPrefix.empty() == false && @@ -243,7 +255,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, NewLine(1); ioprintf(c1out, _(" DeLink %s [%s]\n"), (OriginalPath + InternalPrefix.length()), - SizeToStr(St.st_size).c_str()); + SizeToStr(FileSize).c_str()); c1out << flush; if (NoLinkAct == false) @@ -269,7 +281,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, } } - DeLinkBytes += St.st_size; + DeLinkBytes += FileSize; if (DeLinkBytes/1024 >= DeLinkLimit) ioprintf(c1out, _(" DeLink limit of %sB hit.\n"), SizeToStr(DeLinkBytes).c_str()); } @@ -295,6 +307,8 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, // Process the command line options DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); + DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); + DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); @@ -343,29 +357,19 @@ bool FTWScanner::SetExts(string Vals) // PackagesWriter::DoPackage - Process a single package /*{{{*/ // --------------------------------------------------------------------- /* This method takes a package and gets its control information and - MD5 then writes out a control record with the proper fields rewritten - and the path/size/hash appended. */ + MD5, SHA1 and SHA256 then writes out a control record with the proper fields + rewritten and the path/size/hash appended. */ bool PackagesWriter::DoPackage(string FileName) { - // Open the archive - FileFd F(FileName,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Stat the file for later - struct stat St; - if (fstat(F.Fd(),&St) != 0) - return _error->Errno("fstat",_("Failed to stat %s"),FileName.c_str()); - // Pull all the data we need form the DB - string MD5Res; - if (Db.SetFile(FileName,St,&F) == false || - Db.LoadControl() == false || - (DoContents == true && Db.LoadContents(true) == false) || - (DoMD5 == true && Db.GetMD5(MD5Res,false) == false)) + if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256) + == false) + { return false; + } - if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,St) == false) + off_t FileSize = Db.GetFileSize(); + if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false) return false; // Lookup the overide information @@ -400,7 +404,7 @@ bool PackagesWriter::DoPackage(string FileName) } char Size[40]; - sprintf(Size,"%lu",St.st_size); + sprintf(Size,"%lu", (unsigned long) FileSize); // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; @@ -420,7 +424,9 @@ bool PackagesWriter::DoPackage(string FileName) unsigned int End = 0; SetTFRewriteData(Changes[End++], "Size", Size); - SetTFRewriteData(Changes[End++], "MD5sum", MD5Res.c_str()); + SetTFRewriteData(Changes[End++], "MD5sum", Db.MD5Res.c_str()); + SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str()); + SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str()); SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str()); SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str()); SetTFRewriteData(Changes[End++], "Status", 0); @@ -491,6 +497,10 @@ SourcesWriter::SourcesWriter(string BOverrides,string SOverrides, else NoOverride = true; + // WTF?? The logic above: if we can't read binary overrides, don't even try + // reading source overrides. if we can read binary overrides, then say there + // are no overrides. THIS MAKES NO SENSE! -- ajt@d.o, 2006/02/28 + if (ExtOverrides.empty() == false) SOver.ReadExtraOverride(ExtOverrides); @@ -607,12 +617,14 @@ bool SourcesWriter::DoPackage(string FileName) } auto_ptr<Override::Item> SOverItem(SOver.GetItem(Tags.FindS("Source"))); - const auto_ptr<Override::Item> autoSOverItem(SOverItem); + // const auto_ptr<Override::Item> autoSOverItem(SOverItem); if (SOverItem.get() == 0) { + ioprintf(c1out, _(" %s has no source override entry\n"), Tags.FindS("Source").c_str()); SOverItem = auto_ptr<Override::Item>(BOver.GetItem(Tags.FindS("Source"))); if (SOverItem.get() == 0) { + ioprintf(c1out, _(" %s has no binary override entry either\n"), Tags.FindS("Source").c_str()); SOverItem = auto_ptr<Override::Item>(new Override::Item); *SOverItem = *OverItem; } @@ -657,7 +669,7 @@ bool SourcesWriter::DoPackage(string FileName) realpath(OriginalPath.c_str(),RealPath) != 0) { string RP = RealPath; - if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St) == false) + if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St.st_size) == false) return false; } } @@ -727,26 +739,14 @@ ContentsWriter::ContentsWriter(string DB) : determine what the package name is. */ bool ContentsWriter::DoPackage(string FileName,string Package) { - // Open the archive - FileFd F(FileName,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Stat the file for later - struct stat St; - if (fstat(F.Fd(),&St) != 0) - return _error->Errno("fstat","Failed too stat %s",FileName.c_str()); - - // Ready the DB - if (Db.SetFile(FileName,St,&F) == false || - Db.LoadContents(false) == false) + if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false)) + { return false; + } // Parse the package name if (Package.empty() == true) { - if (Db.LoadControl() == false) - return false; Package = Db.Control.Section.FindS("Package"); } @@ -896,6 +896,11 @@ bool ReleaseWriter::DoPackage(string FileName) SHA1.AddFD(fd.Fd(), fd.Size()); CheckSums[NewFileName].SHA1 = SHA1.Result(); + fd.Seek(0); + SHA256Summation SHA256; + SHA256.AddFD(fd.Fd(), fd.Size()); + CheckSums[NewFileName].SHA256 = SHA256.Result(); + fd.Close(); return true; @@ -927,5 +932,16 @@ void ReleaseWriter::Finish() (*I).second.size, (*I).first.c_str()); } + + fprintf(Output, "SHA256:\n"); + for(map<string,struct CheckSum>::iterator I = CheckSums.begin(); + I != CheckSums.end(); + ++I) + { + fprintf(Output, " %s %16ld %s\n", + (*I).second.SHA256.c_str(), + (*I).second.size, + (*I).first.c_str()); + } } diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 16d014ef8..1d47d57ec 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -45,10 +45,11 @@ class FTWScanner bool NoLinkAct; static FTWScanner *Owner; - static int Scanner(const char *File,const struct stat *sb,int Flag); + static int ScannerFTW(const char *File,const struct stat *sb,int Flag); + static int ScannerFile(const char *File, bool ReadLink); bool Delink(string &FileName,const char *OriginalPath, - unsigned long &Bytes,struct stat &St); + unsigned long &Bytes,off_t FileSize); inline void NewLine(unsigned Priority) { @@ -84,6 +85,8 @@ class PackagesWriter : public FTWScanner // Some flags bool DoMD5; + bool DoSHA1; + bool DoSHA256; bool NoOverride; bool DoContents; @@ -170,6 +173,7 @@ protected: { string MD5; string SHA1; + string SHA256; // Limited by FileFd::Size() unsigned long size; ~CheckSum() {}; diff --git a/methods/connect.cc b/methods/connect.cc index 4e48927ed..8c2ac6d56 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -103,6 +103,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host, if (Err != 0) { errno = Err; + if(errno == ECONNREFUSED) + Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused"); return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(), Service,Name); } diff --git a/methods/ftp.cc b/methods/ftp.cc index f595e0ca4..0c2aa00a7 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm) UBuf.modtime = FailTime; utime(FailFile.c_str(),&UBuf); - // If the file is missing we hard fail otherwise transient fail - if (Missing == true) + // If the file is missing we hard fail and delete the destfile + // otherwise transient fail + if (Missing == true) { + unlink(FailFile.c_str()); return false; + } Fail(true); return true; } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 5cb154f66..ba7389cba 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -11,6 +11,7 @@ #include <errno.h> #include <sys/wait.h> #include <iostream> +#include <sstream> #define GNUPGPREFIX "[GNUPG:]" #define GNUPGBADSIG "[GNUPG:] BADSIG" @@ -20,7 +21,7 @@ class GPGVMethod : public pkgAcqMethod { private: - const char *VerifyGetSigners(const char *file, const char *outfile, + string VerifyGetSigners(const char *file, const char *outfile, vector<string> &GoodSigners, vector<string> &BadSigners, vector<string> &NoPubKeySigners); @@ -32,11 +33,15 @@ class GPGVMethod : public pkgAcqMethod GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; }; -const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, +string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector<string> &GoodSigners, vector<string> &BadSigners, vector<string> &NoPubKeySigners) { + // setup a (empty) stringstream for formating the return value + std::stringstream ret; + ret.str(""); + if (_config->FindB("Debug::Acquire::gpgv", false)) { std::cerr << "inside VerifyGetSigners" << std::endl; @@ -54,9 +59,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Keyring path: " << pubringpath << std::endl; } - if (stat(pubringpath.c_str(), &buff) != 0) - return (string("Couldn't access keyring: ") + strerror(errno)).c_str(); - + if (stat(pubringpath.c_str(), &buff) != 0) + { + ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); + return ret.str(); + } if (pipe(fd) < 0) { return "Couldn't create pipe"; @@ -65,7 +72,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, pid = fork(); if (pid < 0) { - return (string("Couldn't spawn new process") + strerror(errno)).c_str(); + return string("Couldn't spawn new process") + strerror(errno); } else if (pid == 0) { @@ -189,7 +196,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { if (GoodSigners.empty()) return _("Internal error: Good signature, but could not determine key fingerprint?!"); - return NULL; + return ""; } else if (WEXITSTATUS(status) == 1) { @@ -197,9 +204,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - // FIXME String concatenation considered harmful. - return (string(_("Could not execute ")) + gpgvpath + - string(_(" to verify signature (is gnupg installed?)"))).c_str(); + ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str()); + return ret.str(); } else { @@ -221,8 +227,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) URIStart(Res); // Run gpgv on file, extract contents and get the key ID of the signer - const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), - GoodSigners, BadSigners, NoPubKeySigners); + string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), + GoodSigners, BadSigners, NoPubKeySigners); if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty()) { string errmsg; @@ -247,7 +253,11 @@ bool GPGVMethod::Fetch(FetchItem *Itm) errmsg += (*I + "\n"); } } - return _error->Error(errmsg.c_str()); + // this is only fatal if we have no good sigs or if we have at + // least one bad signature. good signatures and NoPubKey signatures + // happen easily when a file is signed with multiple signatures + if(GoodSigners.empty() or !BadSigners.empty()) + return _error->Error(errmsg.c_str()); } // Transfer the modification times diff --git a/methods/http.cc b/methods/http.cc index ba86aa6b6..cb63ada49 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,6 +58,11 @@ unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; +unsigned long CircleBuf::BwReadLimit=0; +unsigned long CircleBuf::BwTickReadData=0; +struct timeval CircleBuf::BwReadTick={0,0}; +const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -65,6 +70,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); + + CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -90,16 +97,45 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { + unsigned long BwReadMax; + while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - + + // what's left to read in this tick + BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + + if(CircleBuf::BwReadLimit) { + struct timeval now; + gettimeofday(&now,0); + + unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + + now.tv_usec-CircleBuf::BwReadTick.tv_usec; + if(d > 1000000/BW_HZ) { + CircleBuf::BwReadTick = now; + CircleBuf::BwTickReadData = 0; + } + + if(CircleBuf::BwTickReadData >= BwReadMax) { + usleep(1000000/BW_HZ); + return true; + } + } + // Write the buffer segment int Res; - Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(CircleBuf::BwReadLimit) { + Res = read(Fd,Buf + (InP%Size), + BwReadMax > LeftRead() ? LeftRead() : BwReadMax); + } else + Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(Res > 0 && BwReadLimit > 0) + CircleBuf::BwTickReadData += Res; + if (Res == 0) return false; if (Res < 0) @@ -204,28 +240,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single) if (Buf[I%Size] != '\n') continue; ++I; - if (I < InP && Buf[I%Size] == '\r') - ++I; if (Single == false) { - if (Buf[I%Size] != '\n') - continue; - ++I; if (I < InP && Buf[I%Size] == '\r') ++I; + if (I >= InP || Buf[I%Size] != '\n') + continue; + ++I; } - if (I > InP) - I = InP; - Data = ""; while (OutP < I) { unsigned long Sz = LeftWrite(); if (Sz == 0) return false; - if (I - OutP < LeftWrite()) + if (I - OutP < Sz) Sz = I - OutP; Data += string((char *)(Buf + (OutP%Size)),Sz); OutP += Sz; @@ -787,7 +818,10 @@ bool HttpMethod::Flush(ServerState *Srv) { if (File != 0) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); if (Srv->In.WriteSpace() == false) return true; @@ -815,7 +849,10 @@ bool HttpMethod::ServerDie(ServerState *Srv) // Dump the buffer to the file if (Srv->State == ServerState::Data) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); while (Srv->In.WriteSpace() == true) { if (Srv->In.Write(File->Fd()) == false) diff --git a/methods/http.h b/methods/http.h index c5a4d0e86..541e2952c 100644 --- a/methods/http.h +++ b/methods/http.h @@ -31,6 +31,11 @@ class CircleBuf unsigned long MaxGet; struct timeval Start; + static unsigned long BwReadLimit; + static unsigned long BwTickReadData; + static struct timeval BwReadTick; + static const unsigned int BW_HZ; + unsigned long LeftRead() { unsigned long Sz = Size - (InP - OutP); diff --git a/methods/makefile b/methods/makefile index 1e3b1ef85..10fce8bfc 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.11 +LIB_APT_PKG_MAJOR = 4.1 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@ -59,6 +59,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = ftp.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) +# The rred method +PROGRAM=rred +SLIBS = -lapt-pkg $(SOCKETLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = rred.cc +include $(PROGRAM_H) + # The rsh method PROGRAM=rsh SLIBS = -lapt-pkg diff --git a/methods/rred.cc b/methods/rred.cc new file mode 100644 index 000000000..6fa57f3a6 --- /dev/null +++ b/methods/rred.cc @@ -0,0 +1,262 @@ +#include <apt-pkg/fileutl.h> +#include <apt-pkg/error.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/hashes.h> + +#include <sys/stat.h> +#include <unistd.h> +#include <utime.h> +#include <stdio.h> +#include <errno.h> +#include <apti18n.h> + +/* this method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. it differs from + * "ed" insofar that it is way more restricted (and therefore secure). in the + * moment only the "c", "a" and "d" commands of ed are implemented (diff + * doesn't output any other). additionally the records must be reverse sorted + * by line number and may not overlap (diff *seems* to produce this kind of + * output). + * */ + +const char *Prog; + +class RredMethod : public pkgAcqMethod +{ + bool Debug; + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the ed commands + enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; + // return values + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; + // this applies a single hunk, it uses a tail recursion to + // reverse the hunks in the file + int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash); + // apply a patch file + int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); + // the methods main method + virtual bool Fetch(FetchItem *Itm); + + public: + + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; +}; + +int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash) { + int pos; + int startline; + int stopline; + int mode; + int written; + char *idx; + + /* get the current command and parse it*/ + if (fgets(buffer, bufsize, ed_cmds) == NULL) { + return line; + } + startline = strtol(buffer, &idx, 10); + if (startline < line) { + return ED_ORDERING; + } + if (*idx == ',') { + idx++; + stopline = strtol(idx, &idx, 10); + } + else { + stopline = startline; + } + if (*idx == 'c') { + mode = MODE_CHANGED; + if (Debug == true) { + std::clog << "changing from line " << startline + << " to " << stopline << std::endl; + } + } + else if (*idx == 'a') { + mode = MODE_ADDED; + if (Debug == true) { + std::clog << "adding after line " << startline << std::endl; + } + } + else if (*idx == 'd') { + mode = MODE_DELETED; + if (Debug == true) { + std::clog << "deleting from line " << startline + << " to " << stopline << std::endl; + } + } + else { + return ED_PARSER; + } + /* get the current position */ + pos = ftell(ed_cmds); + /* if this is add or change then go to the next full stop */ + if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { + do { + fgets(buffer, bufsize, ed_cmds); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + buffer[0] = ' '; + } + } while (strncmp(buffer, ".", 1) != 0); + } + /* do the recursive call */ + line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, + hash); + /* pass on errors */ + if (line < 0) { + return line; + } + /* apply our hunk */ + fseek(ed_cmds, pos, SEEK_SET); + /* first wind to the current position */ + if (mode != MODE_ADDED) { + startline -= 1; + } + while (line < startline) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + line++; + } + /* include from ed script */ + if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { + do { + fgets(buffer, bufsize, ed_cmds); + if (strncmp(buffer, ".", 1) != 0) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + break; + } + } while (1); + } + /* ignore the corresponding number of lines from input */ + if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { + while (line < stopline) { + fgets(buffer, bufsize, in_file); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + } + line++; + } + } + return line; +} + +int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, + Hashes *hash) { + char buffer[BUF_SIZE]; + int result; + int written; + + /* we do a tail recursion to read the commands in the right order */ + result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, + hash); + + /* read the rest from infile */ + if (result > 0) { + while (fgets(buffer, BUF_SIZE, in_file) != NULL) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + return ED_FAILURE; + } + return ED_OK; +} + + +bool RredMethod::Fetch(FetchItem *Itm) +{ + Debug = _config->FindB("Debug::pkgAcquire::RRed",false); + URI Get = Itm->Uri; + string Path = Get.Host + Get.Path; // To account for relative paths + // Path contains the filename to patch + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); + // Res.Filename the destination filename + + if (Debug == true) + std::clog << "Patching " << Path << " with " << Path + << ".ed and putting result into " << Itm->DestFile << std::endl; + // Open the source and destination files (the d'tor of FileFd will do + // the cleanup/closing of the fds) + FileFd From(Path,FileFd::ReadOnly); + FileFd Patch(Path+".ed",FileFd::ReadOnly); + FileFd To(Itm->DestFile,FileFd::WriteEmpty); + To.EraseOnFailure(); + if (_error->PendingError() == true) + return false; + + Hashes Hash; + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(To.Fd(), "w"); + // now do the actual patching + if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { + _error->Errno("rred", _("Could not patch file")); + return false; + } + + // write out the result + fflush(fFrom); + fflush(fPatch); + fflush(fTo); + From.Close(); + Patch.Close(); + To.Close(); + + // Transfer the modification times + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + struct utimbuf TimeBuf; + TimeBuf.actime = Buf.st_atime; + TimeBuf.modtime = Buf.st_mtime; + if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + return _error->Errno("utime",_("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + // return done + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); + + return true; +} + +int main(int argc, char *argv[]) +{ + RredMethod Mth; + + Prog = strrchr(argv[0],'/'); + Prog++; + + return Mth.Run(); +} diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 000000000..3ab76d9dc --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,241 @@ +2006-05-29 Peter Mann <Peter.Mann@tuke.sk> + + * sk.po: Completed to 512t + +2006-05-28 Piarres Beobide <pi@beobide.net> + + * eu.po: Completed to 512t + +2006-05-17 Christian Perrier <bubulle@debian.org> + + * fr.po: Completed to 512t + +2006-05-17 Daniel Nylander <yeager@lidkoping.net> + + * sv.po: Completed to 512t + +2006-05-16 Christian Perrier <bubulle@debian.org> + + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + +2006-04-01 Yavor Doganov <yavor@doganov.org> + + * bg.po: Added, complete to 512t. Closes: #360262 + +2006-03-16 eric pareja <xenos@upm.edu.ph> + + * tl.po: Completed to 512t. Closes: #357215 + +2006-03-13 Sorin Batariuc <sorin@bonbon.net> + + * ro.po: Completed to 512t. Closes: #355897 + +2006-03-12 Miguel Figueiredo <elmig@debianpt.org> + + * pt.po: Completed to 512t. Closes: #355798 + +2006-02-14 Carlos Z.F. Liu <carlosliu@users.sourceforge.net> + + * zh_CN.po: Completed to 512t. Closes: #353936 + +2006-02-14 Samuele Giovanni Tonon <samu@debian.org> + + * it.po: Completed to 512t. Closes: #352803 + +2006-02-13 Andre Luis Lopes <andrelop@debian.org> + + * ca.po: Completed to 512t. Closes: #352419 + +2006-02-06 Jordi Mallach <jordi@debian.org> + + * ca.po: Completed to 512t. Closes: #351592 + +2006-01-30 Piarres Beobide <pi@beobide.net> + + * eu.po: Completed to 512t. Closes: #350483 + +2006-01-24 Kenshi Muto <kmuto@debian.org> + + * ja.po: Completed to 512t. Closes: #349806 + +2006-01-23 Bartosz Fenski aka fEnIo <fenio@debian.org> + + * pl.po: Completed to 512t. Closes: #349514 + +2006-01-23 Peter Mann <Peter.Mann@tuke.sk> + + * sk.po: Completed to 512t. Closes: #349474 + +2006-01-23 Jacobo Tarrio <jtarrio@trasno.net> + + * gl.po: Completed to 512 strings + Closes: #349407 + +2006-01-22 Clytie Siddall <clytie@riverland.net.au> + + * vi.po: Completed to 512 strings + +2006-01-21 Daniel Nylander <yeager@lidkoping.net> + + * sv.po: Completed to 512 strings + Closes: #349210 + +2006-01-21 Yuri Kozlov <kozlov.y@gmail.com> + + * ru.po: Completed to 512 strings + Closes: #349154 + +2006-01-21 Claus Hindsgaul <claus_h@image.dk> + + * da.po: Completed to 512 strings + Closes: #349084 + +2006-01-20 Christian Perrier <bubulle@debian.org> + + * fr.po: Completed to 512 strings + * LINGUAS: Add Welsh + +2006-01-20 Christian Perrier <bubulle@debian.org> + + * *.po: Updated from sources (512 strings) + +2006-01-20 Clytie Siddall <clytie@riverland.net.au> + + * vi.po: Completed to 511 strings + Closes: #348968 + +2006-01-18 Konstantinos Margaritis <markos@debian.org> + + * el.po: Completed to 511 strings + Closes: #344642 + +2005-11-07 Claus Hindsgaul <claus_h@image.dk> + + * da.po: Completed to 511 strings + Closes: #348574 + +2005-11-16 Andrew Deason <adeason@tjhsst.edu> + + * en_GB.po: Minor errors correction + +2005-11-12 Ruben Porras <nahoo82@telefonica.net> + + * es.po: Updated to 510t1f + Closes: #348158 + +2005-11-12 Jacobo Tarrio <jacobo@tarrio.org> + + * gl.po: Completed to 511 strings + Closes: #347729 + +2006-01-10 Samuele Giovanni Tonon <samu@mclink.it> + + * it.po: Yet another update + Closes: #347435 + +2006-01-09 Jonas Koelker <jonaskoelker@users.sourceforge.net> + + * en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + +2006-01-09 Thomas Huriaux <thomas.huriaux@gmail.com> + + * makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + +2006-01-08 Daniel Nylander <yeager@lidkoping.net> + + * sv.po: Completed to 511t. Closes: #346450 + +2006-01-06 Peter Mann <Peter.Mann@tuke.sk> + + * sk.po: Completed to 511t. Closes: #346369 + +2006-01-06 Christian Perrier <bubulle@debian.org> + + * *.po: Updated from sources (511 strings) + * fr.po: Completed to 511t + +2006-01-01 Samuele Giovanni Tonon <samu@mclink.it> + + * it.po: Completed to 510t + +2006-01-01 Neil Williams <linux@codehelp.co.uk> + + * en_GB.po: Completed to 510t + +2005-12-30 Miroslav Kure <kurem@upcase.inf.upol.cz> + + * cs.po: Completed to 510t + +2005-12-25 Ming Hua <minghua@rice.edu> + + * zh_CN.po: Completed to 510t + +2005-12-25 Konstantinos Margaritis <markos@debian.org> + + * el.po: Updated to 510t + +2005-12-19 Clytie Siddall <clytie@riverland.net.au> + + * vi.po: Updated to 383t93f34u + +2005-12-19 eric pareja <xenos@upm.edu.ph> + + * tl.po: Completed to 510 strings + Closes: #344306 + +2005-12-19 Daniel Nylander <yeager@lidkoping.net> + + * sv.po: Completed to 510 strings + Closes: #344056 + +2005-11-29 Christian Perrier <bubulle@debian.org> + + * LINGUAS: disabled Hebrew translation. Closes: #313283 + +2005-12-05 Piarres Beobide <pi@beobide.net> + + * eu.po: Completed to 510 strings + Closes: #342091 + +2005-11-29 Christian Perrier <bubulle@debian.org> + + * fr.po: Completed to 510 strings + * *.po : Synced with the POT files + +2005-11-14 Kov Tchai <tchaikov@sjtu.edu.cn> + + * zh_CN.po: Completed to 510 strings + Definitely Closes: #338267 + +2005-11-13 Kov Tchai <tchaikov@sjtu.edu.cn> + + * zh_CN.po: Completed to 507 strings + Closes: #338267 + +2005-11-09 Jacobo Tarrio <jacobo@tarrio.org> + + * gl.po: Completed to 510 strings + Closes: #338356 + +2005-11-08 Piarres Beobide <pi@beobide.net> + + * eu.po: Completed to 510 strings + Closes: #338101 + +2005-11-07 Claus Hindsgaul <claus_h@image.dk> + + * da.po: Completed to 510 strings + Closes: #337949 + +2005-11-04 Eric Pareja <xenos@upm.edu.ph> + + * tl.po: Completed to 510 strings + Closes: #337306 + +2005-11-04 Christian Perrier <bubulle@debian.org> + + * Changelog: added to better track down fixed issues + diff --git a/po/LINGUAS b/po/LINGUAS index ba7f30eb8..aec84e943 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -bs ca cs da de el en_GB es eu fi fr he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl zh_CN zh_TW +bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW diff --git a/po/apt-all.pot b/po/apt-all.pot index 1caf832f0..e4a6d32d6 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-06-26 15:51+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" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2426 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -192,6 +200,18 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@ -231,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "" @@ -315,115 +335,126 @@ msgstr "" msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format -msgid "File date has changed %s" +msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -519,221 +550,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1558 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:650 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:653 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:656 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:659 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:661 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:665 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:668 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:690 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:694 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:701 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:703 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:756 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:765 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1857 cmdline/apt-get.cc:1890 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1938 cmdline/apt-get.cc:2174 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:817 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:822 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:825 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:830 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:833 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2028 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:867 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:869 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -741,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:890 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1366 cmdline/apt-get.cc:2071 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:980 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2080 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:987 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:991 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:996 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:997 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1031 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1041 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1059 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1070 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1082 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1087 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1092 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -816,79 +847,97 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1111 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1114 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1134 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1142 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1169 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1171 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1177 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1314 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1327 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1385 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1399 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1424 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1427 cmdline/apt-get.cc:1626 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1431 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1450 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1545 cmdline/apt-get.cc:1581 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1568 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1598 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1601 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1613 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -896,158 +945,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1621 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1554 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1629 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1660 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1731 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1732 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1752 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1755 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1760 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1825 cmdline/apt-get.cc:1833 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1933 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:2192 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:2007 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:2031 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:2036 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:2039 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:2045 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2076 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2104 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2116 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2117 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2134 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2153 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2169 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2217 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2269 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2321 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2381 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2395 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2399 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2431 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2472 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1248,7 +1298,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1301,7 +1351,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1331,9 +1382,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "" @@ -1347,7 +1398,7 @@ msgstr "" msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "" @@ -1391,10 +1442,6 @@ msgstr "" msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1465,12 +1512,13 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1596,7 +1644,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1619,7 +1667,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1648,69 +1696,70 @@ msgstr "" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1726,76 +1775,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "" -#: methods/http.cc:741 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1808,7 +1857,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@ -1929,7 +1978,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2005,143 +2054,157 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:102 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:131 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:190 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:196 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:103 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2159,19 +2222,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2185,9 +2248,16 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:825 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li" msgstr "" #: apt-pkg/acquire-worker.cc:113 @@ -2205,12 +2275,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:123 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:139 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2244,115 +2314,134 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:407 apt-pkg/acquire-item.cc:656 +#: apt-pkg/acquire-item.cc:1399 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:1094 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1207 #, 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:775 +#: apt-pkg/acquire-item.cc:1266 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:1302 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:1389 msgid "Size mismatch" msgstr "" @@ -2361,92 +2450,94 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2493,12 +2584,16 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" +msgid "Preparing to completely remove %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" +msgid "Completely removed %s" +msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" msgstr "" #: methods/rsh.cc:330 diff --git a/po/bg.po b/po/bg.po new file mode 100644 index 000000000..e515d6c5b --- /dev/null +++ b/po/bg.po @@ -0,0 +1,2792 @@ +# Bulgarian translation of apt. +# Copyright (C) 2006 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt package. +# Yavor Doganov <yavor@doganov.org>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: apt 0.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-03-31 22:05+0300\n" +"Last-Translator: Yavor Doganov <yavor@doganov.org>\n" +"Language-Team: Bulgarian <dict@fsa-bg.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: cmdline/apt-cache.cc:135 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Пакет %s версия %s има неудовлетворена зависимост:\n" + +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1508 +#, c-format +msgid "Unable to locate package %s" +msgstr "Пакетът %s не може да бъде намерен" + +#: cmdline/apt-cache.cc:232 +msgid "Total package names : " +msgstr "Общо имена на пакети : " + +#: cmdline/apt-cache.cc:272 +msgid " Normal packages: " +msgstr " Нормални пакети: " + +#: cmdline/apt-cache.cc:273 +msgid " Pure virtual packages: " +msgstr " Чисти виртуални пакети: " + +#: cmdline/apt-cache.cc:274 +msgid " Single virtual packages: " +msgstr " Единични виртуални пакети: " + +#: cmdline/apt-cache.cc:275 +msgid " Mixed virtual packages: " +msgstr " Смесени виртуални пакети: " + +#: cmdline/apt-cache.cc:276 +msgid " Missing: " +msgstr " Липсващи: " + +#: cmdline/apt-cache.cc:278 +msgid "Total distinct versions: " +msgstr "Общо уникални версии: " + +#: cmdline/apt-cache.cc:280 +msgid "Total dependencies: " +msgstr "Общо зависимости: " + +#: cmdline/apt-cache.cc:283 +msgid "Total ver/file relations: " +msgstr "Общо отношения версия/файл: " + +#: cmdline/apt-cache.cc:285 +msgid "Total Provides mappings: " +msgstr "Общо отношения „Осигурява“: " + +#: cmdline/apt-cache.cc:297 +msgid "Total globbed strings: " +msgstr "Общо разгърнати низове: " + +#: cmdline/apt-cache.cc:311 +msgid "Total dependency version space: " +msgstr "Общо пространство за зависимости по версии: " + +#: cmdline/apt-cache.cc:316 +msgid "Total slack space: " +msgstr "Общо празно пространство: " + +#: cmdline/apt-cache.cc:324 +msgid "Total space accounted for: " +msgstr "Общо отчетено пространство: " + +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#, c-format +msgid "Package file %s is out of sync." +msgstr "Пакетният файл %s не е синхронизиран." + +#: cmdline/apt-cache.cc:1231 +msgid "You must give exactly one pattern" +msgstr "Трябва да въведете само един израз" + +#: cmdline/apt-cache.cc:1385 +msgid "No packages found" +msgstr "Няма намерени пакети" + +#: cmdline/apt-cache.cc:1462 +msgid "Package files:" +msgstr "Пакетни файлове:" + +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" +"Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" + +#: cmdline/apt-cache.cc:1470 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1482 +msgid "Pinned packages:" +msgstr "Отбити пакети:" + +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +msgid "(not found)" +msgstr "(не са намерени)" + +#. Installed version +#: cmdline/apt-cache.cc:1515 +msgid " Installed: " +msgstr " Инсталирана: " + +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +msgid "(none)" +msgstr "(няма)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1522 +msgid " Candidate: " +msgstr " Кандидат: " + +#: cmdline/apt-cache.cc:1532 +msgid " Package pin: " +msgstr " Отбиване на пакета: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1541 +msgid " Version table:" +msgstr " Таблица с версиите:" + +#: cmdline/apt-cache.cc:1556 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" + +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s %s compiled on %s %s\n" +msgstr "%s %s за %s %s, компилиран на %s %s\n" + +#: cmdline/apt-cache.cc:1659 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Употреба: apt-cache [опции] команда\n" +" apt-cache [опции] add файл1 [файл2 ...]\n" +" apt-cache [опции] showpkg пакет1 [пакет2 ...]\n" +" apt-cache [опции] showsrc пакет1 [пакет2 ...]\n" +"\n" +"apt-cache е инструмент на ниско ниво за обработка на двоичните\n" +"кеш файлове на APT и извличане на информация от тях\n" +"\n" +"Команди:\n" +" add - Добавя пакетен файл към кеша на пакети с изходен код\n" +" gencaches - Генериране на кеша на пакети и пакети с изходен код\n" +" showpkg - Показва обща информация за даден пакет\n" +" showsrc - Показва записите на пакета с изходен код\n" +" stats - Показва някои общи статистики\n" +" dump - Показва целия файл в сбита форма\n" +" dumpavail - Разпечатва наличен файл в stdout\n" +" unmet - Показва неудовлетворени зависимости\n" +" search - Търси в списъка с пакети за регулярен израз\n" +" show - Показва запис за пакета\n" +" depends - Показва необработена информация за зависимости на пакета\n" +" rdepends - Показва информация за обратните зависимости на пакета\n" +" pkgnames - Списък с имената на всички пакети\n" +" dotty - Генериране на графики на пакети за GraphVis\n" +" xvcg - Генериране на графики на пакети за xvcg\n" +" policy - Показване на настройките на политиката\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -p=? Кешът за пакети.\n" +" -s=? Кешът за пакети с изходен код.\n" +" -q Премахване на индикатора за напредък.\n" +" -i Показване само на важни зависимости при командата „unmet“.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" +"Вижте „man“ страниците apt-cache(8) и apt.conf(5) за повече информация.\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Задайте име за този диск, като „Debian 2.1r1 Disk1“" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Сложете диск в устройството и натиснете „Enter“" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Повторете този процес за останалите дискове от комплекта." + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Аргументите не са по двойки" + +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-config [опции] команда\n" +"\n" +"apt-config е опростен инструмент за четене на конфигурационния файл на APT\n" +"\n" +"Команди:\n" +" shell - Режим с обвивка\n" +" dump - Показва конфигурацията\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s не е валиден DEB пакет." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-extracttemplates файл1 [файл2 ...]\n" +"\n" +"apt-extracttemplates е инструмент за извличане на конфигурационна " +"информация\n" +"и шаблони от дебиански пакети\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -t Настройване на временна директория\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#, c-format +msgid "Unable to write to %s" +msgstr "Неуспех при записа на %s" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" + +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +msgid "Package extension list is too long" +msgstr "Списъкът с разширения на пакети и твърде дълъг" + +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#, c-format +msgid "Error processing directory %s" +msgstr "Грешка при обработката на директория %s" + +#: ftparchive/apt-ftparchive.cc:254 +msgid "Source extension list is too long" +msgstr "Списъкът с разширения на източници е твърде дълъг" + +#: ftparchive/apt-ftparchive.cc:371 +msgid "Error writing header to contents file" +msgstr "Грешка при запазването на заглавната част във файла със съдържание" + +#: ftparchive/apt-ftparchive.cc:401 +#, c-format +msgid "Error processing contents %s" +msgstr "Грешка при обработката на съдържание %s" + +#: ftparchive/apt-ftparchive.cc:556 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Употреба: apt-ftparchive [опции] команда\n" +"Команди: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents път\n" +" release път\n" +" generate config [групи]\n" +" clean config\n" +"\n" +"apt-ftparchive генерира индексни файлове за архиви на Debian. Поддържа\n" +"много стилове на генериране от напълно автоматично до функционални\n" +"замени на dpkg-scanpackages и dpkg-scansources.\n" +"\n" +"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n" +"„Package“ представлява съдържанието на всички контролни полета на всеки\n" +"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n" +"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n" +"\n" +"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n" +"файлове. Опцията --source-override може да се използва за указване на файл\n" +"„override“ за пакети с изходен код.\n" +"\n" +"Командите „packages“ и „sources“ трябва да се изпълняват в корена на " +"дървото.\n" +"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене " +"и\n" +"файла „override“ трябва да съдържа всички флагове за преназначаване. " +"Pathprefix\n" +"се прибавя към полетата на файловите имена, ако съществува. Пример за " +"употреба\n" +"от архива на Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" --md5 Управление на генерирането на MD5.\n" +" -s=? Файл „override“ за пакети с изходен код.\n" +" -q Без показване на съобщения.\n" +" -d=? Избор на допълнителна база от данни за кеширане.\n" +" --no-delink Включване на режим за премахване на връзки.\n" +" --contents Управление на генерирането на файлове със съдържание.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция" + +#: ftparchive/apt-ftparchive.cc:762 +msgid "No selections matched" +msgstr "Няма съвпадения на избора" + +#: ftparchive/apt-ftparchive.cc:835 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Липсват някои файлове от групата с файлови пакети „%s“" + +#: ftparchive/cachedb.cc:45 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД е повредена, файлът е преименуван на %s.old" + +#: ftparchive/cachedb.cc:63 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "БД е стара, опит за актуализиране на %s" + +#: ftparchive/cachedb.cc:73 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Неуспех при отварянето на файл %s от БД: %s" + +#: ftparchive/cachedb.cc:114 +#, c-format +msgid "File date has changed %s" +msgstr "Датата на файла %s е променена" + +#: ftparchive/cachedb.cc:155 +msgid "Archive has no control record" +msgstr "В архива няма поле „control“" + +#: ftparchive/cachedb.cc:267 +msgid "Unable to get a cursor" +msgstr "Неуспех при получаването на курсор" + +#: ftparchive/writer.cc:78 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Неуспех при четенето на директория %s\n" + +#: ftparchive/writer.cc:83 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Неуспех при четенето на %s\n" + +#: ftparchive/writer.cc:125 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:127 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:134 +msgid "E: Errors apply to file " +msgstr "E: Грешките се отнасят за файла " + +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#, c-format +msgid "Failed to resolve %s" +msgstr "Неуспех при превръщането на %s" + +#: ftparchive/writer.cc:163 +msgid "Tree walking failed" +msgstr "Неуспех при обхода на дървото" + +#: ftparchive/writer.cc:188 +#, c-format +msgid "Failed to open %s" +msgstr "Неуспех при отварянето на %s" + +#: ftparchive/writer.cc:245 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" + +#: ftparchive/writer.cc:253 +#, c-format +msgid "Failed to readlink %s" +msgstr "Неуспех при прочитането на връзка %s" + +#: ftparchive/writer.cc:257 +#, c-format +msgid "Failed to unlink %s" +msgstr "Неуспех при премахването на връзка %s" + +#: ftparchive/writer.cc:264 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Неуспех при създаването на връзка %s към %s" + +#: ftparchive/writer.cc:274 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "Превишен лимит на DeLink от %sB.\n" + +#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 +#, c-format +msgid "Failed to stat %s" +msgstr "Грешка при получаването на атрибути за %s" + +#: ftparchive/writer.cc:386 +msgid "Archive had no package field" +msgstr "Архивът няма поле „package“" + +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s няма запис „override“\n" + +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " поддържащия пакета %s е %s, а не %s\n" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Неуспех при заделянето на памет" + +#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#, c-format +msgid "Unable to open %s" +msgstr "Неуспех при отварянето на %s" + +#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "Неправилно форматиран override %s, ред %lu #1" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "Неправилно форматиран override %s, ред %lu #2" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "Неправилно форматиран override %s, ред %lu #3" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Неуспех при четенето на override файл %s" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Непознат алгоритъм за компресия „%s“" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Компресираният изход %s изисква настройка за компресирането" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Неуспех при създаването на IPC pipe към подпроцеса" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "Неуспех при създаването на FILE*" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "Неуспех при пускането на подпроцес" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "Процес-потомък за компресиране" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Вътрешна грешка, неуспех при създаването на %s" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "Неуспех при създаването на подпроцес IPC" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "Неуспех при изпълнението на компресиращата програма " + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "декомпресираща програма" + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "В/И към подпроцеса/файла пропадна" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "Неуспех при четене докато се изчислява MD5" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "Неуспех при премахването на връзка на %s" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Неуспех при преименуването на %s на %s" + +#: cmdline/apt-get.cc:120 +msgid "Y" +msgstr "Y" + +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Грешка при компилирането на регулярния израз - %s" + +#: cmdline/apt-get.cc:237 +msgid "The following packages have unmet dependencies:" +msgstr "Следните пакети имат неудовлетворени зависимости:" + +#: cmdline/apt-get.cc:327 +#, c-format +msgid "but %s is installed" +msgstr "но е инсталиран %s" + +#: cmdline/apt-get.cc:329 +#, c-format +msgid "but %s is to be installed" +msgstr "но ще бъде инсталиран %s" + +#: cmdline/apt-get.cc:336 +msgid "but it is not installable" +msgstr "но той не може да бъде инсталиран" + +#: cmdline/apt-get.cc:338 +msgid "but it is a virtual package" +msgstr "но той е виртуален пакет" + +#: cmdline/apt-get.cc:341 +msgid "but it is not installed" +msgstr "но той не е инсталиран" + +#: cmdline/apt-get.cc:341 +msgid "but it is not going to be installed" +msgstr "но той няма да бъде инсталиран" + +#: cmdline/apt-get.cc:346 +msgid " or" +msgstr " или" + +#: cmdline/apt-get.cc:375 +msgid "The following NEW packages will be installed:" +msgstr "Следните НОВИ пакети ще бъдат инсталирани:" + +#: cmdline/apt-get.cc:401 +msgid "The following packages will be REMOVED:" +msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" + +#: cmdline/apt-get.cc:423 +msgid "The following packages have been kept back:" +msgstr "Следните пакети няма да бъдат променени:" + +#: cmdline/apt-get.cc:444 +msgid "The following packages will be upgraded:" +msgstr "Следните пакети ще бъдат актуализирани:" + +#: cmdline/apt-get.cc:465 +msgid "The following packages will be DOWNGRADED:" +msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" + +#: cmdline/apt-get.cc:485 +msgid "The following held packages will be changed:" +msgstr "Следните задържани пакети ще бъдат променени:" + +#: cmdline/apt-get.cc:538 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (поради %s) " + +#: cmdline/apt-get.cc:546 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" +"Това НЕ би трябвало да става освен ако знаете точно какво правите!" + +#: cmdline/apt-get.cc:577 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu актуализирани, %lu нови инсталирани, " + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu преинсталирани, " + +#: cmdline/apt-get.cc:583 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu върнати към по-стара версия, " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu за премахване и %lu без промяна.\n" + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu не са напълно инсталирани или премахнати.\n" + +#: cmdline/apt-get.cc:649 +msgid "Correcting dependencies..." +msgstr "Коригиране на зависимостите..." + +#: cmdline/apt-get.cc:652 +msgid " failed." +msgstr " пропадна." + +#: cmdline/apt-get.cc:655 +msgid "Unable to correct dependencies" +msgstr "Неуспех при коригирането на зависимостите" + +#: cmdline/apt-get.cc:658 +msgid "Unable to minimize the upgrade set" +msgstr "Неуспех при минимизирането на набора актуализации" + +#: cmdline/apt-get.cc:660 +msgid " Done" +msgstr " Готово" + +#: cmdline/apt-get.cc:664 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "" +"Възможно е да изпълните „apt-get -f install“, за да коригирате тези " +"неизправности." + +#: cmdline/apt-get.cc:667 +msgid "Unmet dependencies. Try using -f." +msgstr "Неудовлетворени зависимости. Опитайте с „-f“." + +#: cmdline/apt-get.cc:689 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" + +#: cmdline/apt-get.cc:693 +msgid "Authentication warning overridden.\n" +msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" + +#: cmdline/apt-get.cc:700 +msgid "Install these packages without verification [y/N]? " +msgstr "Инсталиране на тези пакети без проверка [y/N]?" + +#: cmdline/apt-get.cc:702 +msgid "Some packages could not be authenticated" +msgstr "Някои пакети не можаха да бъдат удостоверени" + +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +msgid "There are problems and -y was used without --force-yes" +msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" + +#: cmdline/apt-get.cc:755 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" + +#: cmdline/apt-get.cc:764 +msgid "Packages need to be removed but remove is disabled." +msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." + +#: cmdline/apt-get.cc:775 +msgid "Internal error, Ordering didn't finish" +msgstr "Вътрешна грешка, „Ordering“ не завърши" + +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +msgid "Unable to lock the download directory" +msgstr "Неуспех при заключването на директорията за изтегляне" + +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: apt-pkg/cachefile.cc:67 +msgid "The list of sources could not be read." +msgstr "Списъкът с източници не можа да бъде прочетен." + +#: cmdline/apt-get.cc:816 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" + +#: cmdline/apt-get.cc:821 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" + +#: cmdline/apt-get.cc:824 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Необходимо е да се изтеглят %sB архиви.\n" + +#: cmdline/apt-get.cc:829 +#, c-format +msgid "After unpacking %sB of additional disk space will be used.\n" +msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n" + +#: cmdline/apt-get.cc:832 +#, c-format +msgid "After unpacking %sB disk space will be freed.\n" +msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" + +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "Неуспех при определянето на свободното пространство в %s" + +#: cmdline/apt-get.cc:849 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Нямате достатъчно свободно пространство в %s." + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Указано е „Trivial Only“, но това не е тривиална операция." + +#: cmdline/apt-get.cc:866 +msgid "Yes, do as I say!" +msgstr "Да, прави каквото казвам!" + +#: cmdline/apt-get.cc:868 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"На път сте да направите нещо потенциално опасно.\n" +"За да продължите, въведете фразата „%s“\n" +" ?] " + +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +msgid "Abort." +msgstr "Прекъсване." + +#: cmdline/apt-get.cc:889 +msgid "Do you want to continue [Y/n]? " +msgstr "Искате ли да продължите [Y/n]? " + +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Неуспех при изтеглянето на %s %s\n" + +#: cmdline/apt-get.cc:979 +msgid "Some files failed to download" +msgstr "Някои файлове не можаха да бъдат изтеглени" + +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +msgid "Download complete and in download only mode" +msgstr "Изтеглянето завърши в режим само на изтегляне" + +#: cmdline/apt-get.cc:986 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " +"или да опитате с „--fix-missing“?" + +#: cmdline/apt-get.cc:990 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" + +#: cmdline/apt-get.cc:995 +msgid "Unable to correct missing packages." +msgstr "Неуспех при коригирането на липсващите пакети." + +#: cmdline/apt-get.cc:996 +msgid "Aborting install." +msgstr "Прекъсване на инсталирането." + +#: cmdline/apt-get.cc:1030 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Забележете, избиране на %s вместо %s\n" + +#: cmdline/apt-get.cc:1040 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" + +#: cmdline/apt-get.cc:1058 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" + +#: cmdline/apt-get.cc:1069 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" + +#: cmdline/apt-get.cc:1081 +msgid " [Installed]" +msgstr " [Инсталиран]" + +#: cmdline/apt-get.cc:1086 +msgid "You should explicitly select one to install." +msgstr "Трябва изрично да изберете един за инсталиране." + +#: cmdline/apt-get.cc:1091 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"Пакетът %s не е наличен, но е в списъка със зависимости на друг пакет.\n" +"Това може да означава, че пакета липсва, остарял е, или е достъпен\n" +"само от друг източник\n" + +#: cmdline/apt-get.cc:1110 +msgid "However the following packages replace it:" +msgstr "Обаче следните пакети го заместват:" + +#: cmdline/apt-get.cc:1113 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Пакетът %s няма кандидат за инсталиране" + +#: cmdline/apt-get.cc:1133 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" + +#: cmdline/apt-get.cc:1141 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s вече е най-новата версия.\n" + +#: cmdline/apt-get.cc:1168 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Не е намерено издание „%s“ на „%s“" + +#: cmdline/apt-get.cc:1170 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Не е намерена версия „%s“ на „%s“" + +#: cmdline/apt-get.cc:1176 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Избрана е версия %s (%s) за %s\n" + +#: cmdline/apt-get.cc:1313 +msgid "The update command takes no arguments" +msgstr "Командата „update“ не възприема аргументи" + +#: cmdline/apt-get.cc:1326 +msgid "Unable to lock the list directory" +msgstr "Неуспех при заключването на директорията със списъка на пакетите" + +#: cmdline/apt-get.cc:1384 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " +"са използвани по-стари." + +#: cmdline/apt-get.cc:1403 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" + +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#, c-format +msgid "Couldn't find package %s" +msgstr "Неуспех при намирането на пакет %s" + +#: cmdline/apt-get.cc:1516 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" + +#: cmdline/apt-get.cc:1546 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" + +#: cmdline/apt-get.cc:1549 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " +"укажете разрешение)." + +#: cmdline/apt-get.cc:1561 +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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Някои пакети не можаха да бъдат инсталирани. Това може да означава,\n" +"че сте изискали невъзможна ситуация или ако използвате нестабилната\n" +"дистрибуция, че някои необходими пакети още не са създадени или пък\n" +"са били преместени от Incoming." + +#: cmdline/apt-get.cc:1569 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." +msgstr "" +"Тъй като сте указали единична операция, твърде е възможно пакета просто\n" +"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" +"доклад за грешка за този пакет." + +#: cmdline/apt-get.cc:1574 +msgid "The following information may help to resolve the situation:" +msgstr "" +"Следната информация може да помогне за намиране на изход от ситуацията:" + +#: cmdline/apt-get.cc:1577 +msgid "Broken packages" +msgstr "Счупени пакети" + +#: cmdline/apt-get.cc:1603 +msgid "The following extra packages will be installed:" +msgstr "Следните допълнителни пакети ще бъдат инсталирани:" + +#: cmdline/apt-get.cc:1674 +msgid "Suggested packages:" +msgstr "Предложени пакети:" + +#: cmdline/apt-get.cc:1675 +msgid "Recommended packages:" +msgstr "Препоръчвани пакети:" + +#: cmdline/apt-get.cc:1695 +msgid "Calculating upgrade... " +msgstr "Изчисляване на актуализацията..." + +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +msgid "Failed" +msgstr "Неуспех" + +#: cmdline/apt-get.cc:1703 +msgid "Done" +msgstr "Готово" + +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +msgid "Internal error, problem resolver broke stuff" +msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" + +#: cmdline/apt-get.cc:1876 +msgid "Must specify at least one package to fetch source for" +msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" + +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Неуспех при намирането на изходен код на пакет %s" + +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Пропускане на вече изтегления файл „%s“\n" + +#: cmdline/apt-get.cc:1974 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Нямате достатъчно свободно пространство в %s" + +#: cmdline/apt-get.cc:1979 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" + +#: cmdline/apt-get.cc:1982 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" + +#: cmdline/apt-get.cc:1988 +#, c-format +msgid "Fetch source %s\n" +msgstr "Изтегляне на изходен код %s\n" + +#: cmdline/apt-get.cc:2019 +msgid "Failed to fetch some archives." +msgstr "Неуспех при изтеглянето на някои архиви." + +#: cmdline/apt-get.cc:2047 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "" +"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" + +#: cmdline/apt-get.cc:2059 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Командата за разпакетиране „%s“ пропадна.\n" + +#: cmdline/apt-get.cc:2060 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" + +#: cmdline/apt-get.cc:2077 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Командата за компилиране „%s“ пропадна.\n" + +#: cmdline/apt-get.cc:2096 +msgid "Child process failed" +msgstr "Процесът-потомък пропадна" + +#: cmdline/apt-get.cc:2112 +msgid "Must specify at least one package to check builddeps for" +msgstr "" +"Трябва да укажете поне един пакет за проверка на зависимости за компилиране" + +#: cmdline/apt-get.cc:2140 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "" +"Неуспех при получаването на информация за зависимостите за компилиране на %s" + +#: cmdline/apt-get.cc:2160 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s няма зависимости за компилиране.\n" + +#: cmdline/apt-get.cc:2212 +#, 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:2264 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже няма " +"налични версии на пакета %s, които могат да удовлетворят изискването за " +"версия" + +#: cmdline/apt-get.cc:2299 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " +"пакет %s е твърде нов" + +#: cmdline/apt-get.cc:2324 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" + +#: cmdline/apt-get.cc:2338 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." + +#: cmdline/apt-get.cc:2342 +msgid "Failed to process build dependencies" +msgstr "Неуспех при обработката на зависимостите за компилиране" + +#: cmdline/apt-get.cc:2374 +msgid "Supported modules:" +msgstr "Поддържани модули:" + +#: cmdline/apt-get.cc:2415 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Употреба: apt-get [опции] команда\n" +" apt-get [опции] install|remove пакет1 [пакет2 ...]\n" +" apt-get [опции] source пакет1 [пакет2 ...]\n" +"\n" +"apt-get е опростен интерфейс за командния ред за изтегляне и\n" +"инсталиране на пакети. Най-често използваните команди са „update“\n" +"и „install“.\n" +"\n" +"Команди:\n" +" update - Зареждане на нови списъци с пакети\n" +" upgrade - Извършване на актуализиране\n" +" install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n" +" remove - Премахване на пакети\n" +" source - Изтегляне на изходен код на пакети\n" +" build-dep - Конфигуриране на зависимостите за компилиране за изходен код " +"на пакети\n" +" dist-upgrade - Актуализиране на дистрибуцията, вижте apt-get(8)\n" +" dselect-upgrade - Следване на избора на dselect\n" +" clean - Изтриване на изтеглените файлове\n" +" autoclean - Изтриване на стари изтеглени файлове\n" +" check - Проверка за счупени зависимости\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -q Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n" +" -qq Без изход на съобщения освен при грешки\n" +" -d Само изтегляне - да НЕ се инсталират или разпакетират архивите\n" +" -s Без действие. Предизвикване на симулация.\n" +" -y Отговаряне с „Да“ на всички въпроси, без питане\n" +" -f Опит за продължаване дори и при неуспех на проверката за цялост\n" +" -m Опит за продължаване дори и ако архивите са неоткриваеми\n" +" -u Показване на списък с пакетите са актуализиране\n" +" -b Компилиране на изходния код на пакета след изтеглянето му\n" +" -V Показване на подробни версии\n" +" -c=? Четене на този конфигурационен файл\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" +"Вижте страниците на apt-get(8), sources.list(5) и apt.conf(5) за повече\n" +"информация и опции.\n" +" Това APT има Върховни Сили.\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Поп " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Изт:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Игн " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Грш " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Изтеглени %sB за %s (%sB/сек)\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [В процес на работа]" + +#: cmdline/acqprogress.cc:271 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Смяна на носител: сложете диска с етикет\n" +" „%s“\n" +"в устройството „%s“ и натиснете „Enter“\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Непознат запис за пакет!" + +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n" +"\n" +"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n" +"„-s“ се използва, за да покаже типа на файла.\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -s Използване на сортиране по изходен код.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Лоша стандартна настройка!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "Натиснете „Enter“, за да продължите." + +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират" + +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или" + +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките" + +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"над това съобщение за важни. Коригирайте ги и изпълнете [I]nstall наново" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Смесване на наличната информация" + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Неуспех при създаването на програмни канали" + +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Неуспех при изпълнението на gzip" + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +msgid "Corrupted archive" +msgstr "Развален архив" + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Невярна контролна сума на tar, развален архив" + +#: apt-inst/contrib/extracttar.cc:298 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Непозната заглавна част на TAR тип %u, елемент %s" + +#: apt-inst/contrib/arfile.cc:73 +msgid "Invalid archive signature" +msgstr "Невалиден подпис на архива" + +#: apt-inst/contrib/arfile.cc:81 +msgid "Error reading archive member header" +msgstr "Грешка при четене на заглавната част на елемента на архива" + +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +msgid "Invalid archive member header" +msgstr "Невалидна заглавна част на елемента на архива" + +#: apt-inst/contrib/arfile.cc:131 +msgid "Archive is too short" +msgstr "Архивът е твърде кратък" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Failed to read the archive headers" +msgstr "Неуспех при четенето на заглавните части на архива" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "Извикан е DropNode за все още използван възел" + +#: apt-inst/filelist.cc:416 +msgid "Failed to locate the hash element!" +msgstr "Грешка при намирането на хеш-елемента!" + +#: apt-inst/filelist.cc:463 +msgid "Failed to allocate diversion" +msgstr "Неуспех при установяване на отклонението" + +#: apt-inst/filelist.cc:468 +msgid "Internal error in AddDiversion" +msgstr "Вътрешна грешка в AddDiversion" + +#: apt-inst/filelist.cc:481 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" + +#: apt-inst/filelist.cc:510 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Двойно добавяне на отклонение %s -> %s" + +#: apt-inst/filelist.cc:553 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Дублиран конфигурационен файл %s/%s" + +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#, c-format +msgid "Failed to write file %s" +msgstr "Неуспех при запис на файл %s" + +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#, c-format +msgid "Failed to close file %s" +msgstr "Неуспех при затварянето на файл %s" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "Пътят %s е твърде дълъг" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Разпакетиране на %s повече от веднъж" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "Директорията %s е отклонена" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Пътят за отклонение е твърде дълъг" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Директорията %s се заменя с не-директория" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Неуспех при намирането на възел в неговия хеш" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Пътят е твърде дълъг" + +#: apt-inst/extract.cc:417 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Файловете се заменят със съдържанието на пакета %s без версия" + +#: apt-inst/extract.cc:434 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Файл %s/%s заменя този в пакет %s" + +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#, c-format +msgid "Unable to read %s" +msgstr "Неуспех при четенето на %s" + +#: apt-inst/extract.cc:494 +#, c-format +msgid "Unable to stat %s" +msgstr "Неуспех при получаването на атрибути за %s" + +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#, c-format +msgid "Failed to remove %s" +msgstr "Неуспех при премахването на %s" + +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#, c-format +msgid "Unable to create %s" +msgstr "Неуспех при създаването на %s" + +#: apt-inst/deb/dpkgdb.cc:118 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "Неуспех при получаването на атрибути %sinfo" + +#: apt-inst/deb/dpkgdb.cc:123 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "" +"Директориите info и temp трябва да бъдат на една и съща файлова система" + +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 +#: apt-pkg/pkgcachegen.cc:840 +msgid "Reading package lists" +msgstr "Четене на списъците с пакети" + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "Неуспех при преминаването в администраторската директория %sinfo" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 +msgid "Internal error getting a package name" +msgstr "Вътрешна грешка при получаването на името на пакета" + +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +msgid "Reading file listing" +msgstr "Четене на списъка на файловете" + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Неуспех при отварянето на списъка с файлове „%sinfo/%s“. Ако не може да " +"възстановите този файл, запишете го като празен и веднага преинсталирайте " +"същата версия на пакета!" + +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s" + +#: apt-inst/deb/dpkgdb.cc:266 +msgid "Internal error getting a node" +msgstr "Вътрешна грешка при получаването на възел" + +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "Неуспех при отварянето на файл с отклонения %sdiversions" + +#: apt-inst/deb/dpkgdb.cc:324 +msgid "The diversion file is corrupted" +msgstr "Файлът с отклонения е повреден" + +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "Неправилен ред във файла с отклонения: %s" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal error adding a diversion" +msgstr "Вътрешна грешка при добавянето на отклонение" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "Първо трябва да се инициализира кеша с пакети" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "Грешка при анализирането на MD5. Изместване %lu" + +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Това не е валиден DEB архив, липсва елемент „%s“" + +#: apt-inst/deb/debfile.cc:52 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“" + +#: apt-inst/deb/debfile.cc:112 +#, c-format +msgid "Couldn't change to %s" +msgstr "Неуспех при преминаването в %s" + +#: apt-inst/deb/debfile.cc:138 +msgid "Internal error, could not locate member" +msgstr "Вътрешна грешка, не може да се открие елемент" + +#: apt-inst/deb/debfile.cc:171 +msgid "Failed to locate a valid control file" +msgstr "Неуспех при намирането на валиден контролен файл" + +#: apt-inst/deb/debfile.cc:256 +msgid "Unparsable control file" +msgstr "Контролен файл, невъзможен за анализ" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Неуспех при четенето на базата %s със CD-ROM" + +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Използвайте „apt-cdrom“, за да може този CD-ROM да се разпознава от APT. " +"„apt-get update“ не може да се използва за добавяне на нови дискове" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "Грешен CD-ROM" + +#: methods/cdrom.cc:164 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва." + +#: methods/cdrom.cc:169 +msgid "Disk not found." +msgstr "Дискът не е намерен." + +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Файлът не е намерен" + +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/gzip.cc:142 +msgid "Failed to stat" +msgstr "Неуспех при получаването на атрибути" + +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +msgid "Failed to set modification time" +msgstr "Неуспех при задаването на време на промяна" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Влизане" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Неуспех при установяването на името на отдалечения сървър" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Неуспех при установяването на локалното име" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "Сървърът отказа свързване и съобщи: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::" +"ProxyLogin е празен." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Допустимото време за свързването изтече" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "Сървърът разпадна връзката" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +msgid "Read error" +msgstr "Грешка при четене" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Отговорът препълни буфера." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Развален протокол" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +msgid "Write error" +msgstr "Грешка при запис" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Неуспех при създаването на гнездо" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" +"Неуспех при свързването на гнездо за данни, допустимото време за свъзрзване " +"изтече" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "Неуспех при свързването на пасивно гнездо." + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo не успя да се добере до слушащо гнездо" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Неуспех при свързването на гнездо" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "Неуспех при слушането на гнездото" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Неуспех при определянето на името на гнездото" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Неуспех при изпращането на командата PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Неизвестно семейство адреси %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Времето за установяване на връзка с гнездо за данни изтече" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Невъзможно е да се приеме свързването" + +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Проблем при хеширане на файла" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Времето за връзка с гнездо за данни изтече" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Запитване" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "Неуспех при извикването на " + +#: methods/connect.cc:64 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Свързване с %s (%s)" + +#: methods/connect.cc:71 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:80 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" + +#: methods/connect.cc:86 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Не може да се започне свързване с %s:%s (%s)." + +#: methods/connect.cc:93 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" + +#: methods/connect.cc:108 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Неуспех при свързване с %s:%s (%s)." + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:136 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "Свързване с %s" + +#: methods/connect.cc:167 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Неуспех при намирането на IP адреса на „%s“" + +#: methods/connect.cc:173 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Временен неуспех при намирането на IP адреса на „%s“" + +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" + +#: methods/connect.cc:223 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Неуспех при свързването с %s %s:" + +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Неуспех при намирането на IP адреса на „%s“" + +#: methods/gpgv.cc:99 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " +"на работа." + +#: methods/gpgv.cc:198 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " +"ключа?!" + +#: methods/gpgv.cc:203 +msgid "At least one invalid signature was encountered." +msgstr "Намерен е поне един невалиден подпис." + +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " за проверка на подписа (инсталиран ли е gnupg?)" + +#: methods/gpgv.cc:212 +msgid "Unknown error executing gpgv" +msgstr "Неизвестна грешка при изпълнението на gpgv" + +#: methods/gpgv.cc:243 +msgid "The following signatures were invalid:\n" +msgstr "Следните подписи са невалидни:\n" + +#: methods/gpgv.cc:250 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " +"наличен:\n" + +#: methods/gzip.cc:57 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Неуспех при отварянето на програмен канал за %s" + +#: methods/gzip.cc:102 +#, c-format +msgid "Read error from %s process" +msgstr "Грешка при четене от процес %s" + +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "Чакане на заглавни части" + +#: methods/http.cc:522 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "Получен е един ред на заглавна част с над %u символа" + +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "Невалиден ред на заглавна част" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "Неизвестен формат на дата" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "Неуспех на избора" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "Допустимото време за свързване изтече" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "Грешка при записа на изходен файл" + +#: methods/http.cc:832 +msgid "Error writing to file" +msgstr "Грешка при записа на файл" + +#: methods/http.cc:860 +msgid "Error writing to the file" +msgstr "Грешка при записа на файла" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "Грешка при четене от сървъра" + +#: methods/http.cc:1107 +msgid "Bad header data" +msgstr "Невалидни данни на заглавната част" + +#: methods/http.cc:1124 +msgid "Connection failed" +msgstr "Неуспех при свързването" + +#: methods/http.cc:1215 +msgid "Internal error" +msgstr "Вътрешна грешка" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "Невъзможно е да се прехвърли в паметта празен файл" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Неуспех при прехвърлянето в паметта на %lu байта" + +#: apt-pkg/contrib/strutl.cc:938 +#, c-format +msgid "Selection %s not found" +msgstr "Изборът %s не е намерен" + +#: apt-pkg/contrib/configuration.cc:436 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Неизвестен тип на абревиатура: „%c“" + +#: apt-pkg/contrib/configuration.cc:494 +#, c-format +msgid "Opening configuration file %s" +msgstr "Отваряне на конфигурационен файл %s" + +#: apt-pkg/contrib/configuration.cc:512 +#, c-format +msgid "Line %d too long (max %d)" +msgstr "Ред %d е твърде дълъг (максимум %d)" + +#: apt-pkg/contrib/configuration.cc:608 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Синтактична грешка %s:%u: В началото на блока няма име." + +#: apt-pkg/contrib/configuration.cc:627 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" + +#: apt-pkg/contrib/configuration.cc:644 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" + +#: apt-pkg/contrib/configuration.cc:684 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" +"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " +"ниво" + +#: apt-pkg/contrib/configuration.cc:691 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" + +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" + +#: apt-pkg/contrib/configuration.cc:704 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" + +#: apt-pkg/contrib/progress.cc:154 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Грешка!" + +#: apt-pkg/contrib/progress.cc:156 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Готово" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Неизвестна опция за команден ред „%c“ [от %s]." + +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Опцията за команден ред %s не е разпозната" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Опцията за команден ред %s не е булева" + +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#, c-format +msgid "Option %s requires an argument." +msgstr "Опция %s изисква аргумент." + +#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Опция %s: Значението трябва да има =<val>." + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Опция %s изисква аргумент цяло число, не „%s“" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "Опция „%s“ е твърде дълга" + +#: apt-pkg/contrib/cmndline.cc:301 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Смисълът %s не е ясен, опитайте true или false." + +#: apt-pkg/contrib/cmndline.cc:351 +#, c-format +msgid "Invalid operation %s" +msgstr "Невалидна операция %s" + +#: apt-pkg/contrib/cdromutl.cc:55 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" + +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#, c-format +msgid "Unable to change to %s" +msgstr "Неуспех при преминаването в %s" + +#: apt-pkg/contrib/cdromutl.cc:190 +msgid "Failed to stat the cdrom" +msgstr "Неуспех при намирането на атрибутите на cdrom" + +#: apt-pkg/contrib/fileutl.cc:82 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "" +"Не се използва заключване за файл за заключване %s, който е само за четене" + +#: apt-pkg/contrib/fileutl.cc:87 +#, c-format +msgid "Could not open lock file %s" +msgstr "Неуспех при отварянето на файл за заключване %s" + +#: apt-pkg/contrib/fileutl.cc:105 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Не се използва заключване за файл за заключване %s, който е монтиран по NFS" + +#: apt-pkg/contrib/fileutl.cc:109 +#, c-format +msgid "Could not get lock %s" +msgstr "Неуспех при достъпа до заключване %s" + +#: apt-pkg/contrib/fileutl.cc:377 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "Изчака се завършването на %s, но той не беше пуснат" + +#: apt-pkg/contrib/fileutl.cc:387 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." + +#: apt-pkg/contrib/fileutl.cc:390 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Подпроцесът %s върна код за грешка (%u)" + +#: apt-pkg/contrib/fileutl.cc:392 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Подпроцесът %s завърши неочаквано" + +#: apt-pkg/contrib/fileutl.cc:436 +#, c-format +msgid "Could not open file %s" +msgstr "Неуспех при отварянето на файла %s" + +#: apt-pkg/contrib/fileutl.cc:492 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "" +"грешка при четене, все още има %lu за четене, но няма нито един останал" + +#: apt-pkg/contrib/fileutl.cc:522 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "грешка при запис, все още име %lu за запис, но не успя" + +#: apt-pkg/contrib/fileutl.cc:597 +msgid "Problem closing the file" +msgstr "Проблем при затварянето на файла" + +#: apt-pkg/contrib/fileutl.cc:603 +msgid "Problem unlinking the file" +msgstr "Проблем при премахването на връзка към файла" + +#: apt-pkg/contrib/fileutl.cc:614 +msgid "Problem syncing the file" +msgstr "Проблем при синхронизиране на файла" + +#: apt-pkg/pkgcache.cc:126 +msgid "Empty package cache" +msgstr "Празен кеш на пакети" + +#: apt-pkg/pkgcache.cc:132 +msgid "The package cache file is corrupted" +msgstr "Файлът за кеш на пакети е повреден" + +#: apt-pkg/pkgcache.cc:137 +msgid "The package cache file is an incompatible version" +msgstr "Файлът за кеш на пакети е несъвместима версия" + +#: apt-pkg/pkgcache.cc:142 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Тази версия на APT не поддържа система за версии „%s“" + +#: apt-pkg/pkgcache.cc:147 +msgid "The package cache was built for a different architecture" +msgstr "Кешът на пакети е бил направен за различна архитектура" + +#: apt-pkg/pkgcache.cc:218 +msgid "Depends" +msgstr "Зависи от" + +#: apt-pkg/pkgcache.cc:218 +msgid "PreDepends" +msgstr "Предварително зависи от" + +#: apt-pkg/pkgcache.cc:218 +msgid "Suggests" +msgstr "Предлага се" + +#: apt-pkg/pkgcache.cc:219 +msgid "Recommends" +msgstr "Препоръчва се" + +#: apt-pkg/pkgcache.cc:219 +msgid "Conflicts" +msgstr "Конфликтира с" + +#: apt-pkg/pkgcache.cc:219 +msgid "Replaces" +msgstr "Заменя" + +#: apt-pkg/pkgcache.cc:220 +msgid "Obsoletes" +msgstr "Изважда от употреба" + +#: apt-pkg/pkgcache.cc:231 +msgid "important" +msgstr "важен" + +#: apt-pkg/pkgcache.cc:231 +msgid "required" +msgstr "изискван" + +#: apt-pkg/pkgcache.cc:231 +msgid "standard" +msgstr "стандартен" + +#: apt-pkg/pkgcache.cc:232 +msgid "optional" +msgstr "незадължителен" + +#: apt-pkg/pkgcache.cc:232 +msgid "extra" +msgstr "допълнителен" + +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +msgid "Building dependency tree" +msgstr "Изграждане на дървото със зависимости" + +#: apt-pkg/depcache.cc:61 +msgid "Candidate versions" +msgstr "Версии кандидати" + +#: apt-pkg/depcache.cc:90 +msgid "Dependency generation" +msgstr "Генериране на зависимости" + +#: apt-pkg/tagfile.cc:72 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Неуспех при анализирането на пакетен файл %s (1)" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Неуспех при анализирането на пакетен файл %s (2)" + +#: apt-pkg/sourcelist.cc:94 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" + +#: apt-pkg/sourcelist.cc:105 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" + +#: apt-pkg/sourcelist.cc:112 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" + +#: apt-pkg/sourcelist.cc:203 +#, c-format +msgid "Opening %s" +msgstr "Отваряне на %s" + +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Ред %u в списъка с източници %s е твърде дълъг." + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" + +#: apt-pkg/sourcelist.cc:244 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." + +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "" +"Лошо форматиран ред %u в списъка с източници %s (идентификатор на " +"производител)" + +#: apt-pkg/packagemanager.cc:402 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"В следствие на циклични зависимости от типа „Конфликтира/Предварително " +"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия " +"пакет %s. Това често е лошо, но ако наистина искате да го направите, " +"активирайте опцията APT::Force-LoopBreak." + +#: apt-pkg/pkgrecords.cc:37 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Не се поддържа индексен файл от типа „%s“" + +#: apt-pkg/algorithms.cc:241 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " +"него." + +#: apt-pkg/algorithms.cc:1059 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " +"причинено от задържани пакети." + +#: apt-pkg/algorithms.cc:1061 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Неуспех при коригирането на проблемите, имате задържани счупени пакети." + +#: apt-pkg/acquire.cc:62 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Директорията със списъци %spartial липсва." + +#: apt-pkg/acquire.cc:66 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Директорията за архиви %spartial липсва." + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Изтегляне на файл %li от %li (остават %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Четене на списъка на файловете" + +#: apt-pkg/acquire-worker.cc:113 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Неуспех при намирането на драйвер за метод %s." + +#: apt-pkg/acquire-worker.cc:162 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Методът %s не стартира правилно" + +#: apt-pkg/acquire-worker.cc:377 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." + +#: apt-pkg/init.cc:120 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Пакетната система „%s“ не е поддържана" + +#: apt-pkg/init.cc:136 +msgid "Unable to determine a suitable packaging system type" +msgstr "Неуспех при определянето на подходяща пакетна система" + +#: apt-pkg/clean.cc:61 +#, c-format +msgid "Unable to stat %s." +msgstr "Неуспех при получаването на атрибути на %s." + +#: apt-pkg/srcrecords.cc:48 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" + +#: apt-pkg/cachefile.cc:73 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " +"или отворени." + +#: apt-pkg/cachefile.cc:77 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" + +#: apt-pkg/policy.cc:269 +msgid "Invalid record in the preferences file, no Package header" +msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" + +#: apt-pkg/policy.cc:291 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Неизвестен тип за отбиване %s" + +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "Няма указан приоритет (или е нула) на отбиването" + +#: apt-pkg/pkgcachegen.cc:74 +msgid "Cache has an incompatible versioning system" +msgstr "Кешът има несъвместима система за версии" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Възникна грешка при обработката на %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Възникна грешка при обработката на %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Възникна грешка при обработката на %s (UsePackage2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Възникна грешка при обработката на %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Възникна грешка при обработката на %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Възникна грешка при обработката на %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " +"APT." + +#: apt-pkg/pkgcachegen.cc:210 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:213 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Възникна грешка при обработката на %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Възникна грешка при обработката на %s (CollectFileProvides)" + +#: apt-pkg/pkgcachegen.cc:260 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" + +#: apt-pkg/pkgcachegen.cc:574 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" +"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" + +#: apt-pkg/pkgcachegen.cc:658 +msgid "Collecting File Provides" +msgstr "Събиране на информация за „Осигурява“" + +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +msgid "IO Error saving source cache" +msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" + +#: apt-pkg/acquire-item.cc:126 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "преименуването се провали, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +msgid "MD5Sum mismatch" +msgstr "Несъответствие на контролна сума MD5" + +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" + +#: apt-pkg/acquire-item.cc:753 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " +"ръчно да оправите този пакет (поради пропусната архитектура)." + +#: apt-pkg/acquire-item.cc:812 +#, c-format +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" +"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " +"ръчно да оправите този пакет." + +#: apt-pkg/acquire-item.cc:848 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." + +#: apt-pkg/acquire-item.cc:935 +msgid "Size mismatch" +msgstr "Несъответствие на размера" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Блокът на производителя %s не съдържа отпечатък" + +#: apt-pkg/cdrom.cc:507 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"Използване на точка за монтиране на CD-ROM %s\n" +"Монтиране на CD-ROM\n" + +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +msgid "Identifying.. " +msgstr "Идентифициране..." + +#: apt-pkg/cdrom.cc:541 +#, c-format +msgid "Stored label: %s \n" +msgstr "Запазен етикет: %s \n" + +#: apt-pkg/cdrom.cc:561 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Използване на точка за монтиране на CD-ROM %s\n" + +#: apt-pkg/cdrom.cc:579 +msgid "Unmounting CD-ROM\n" +msgstr "Демонтиране на CD-ROM\n" + +#: apt-pkg/cdrom.cc:583 +msgid "Waiting for disc...\n" +msgstr "Чакане за диск...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:591 +msgid "Mounting CD-ROM...\n" +msgstr "Монтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:609 +msgid "Scanning disc for index files..\n" +msgstr "Сканиране на диска за индексни файлове...\n" + +#: apt-pkg/cdrom.cc:647 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" +"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " +"подписа.\n" + +#: apt-pkg/cdrom.cc:710 +msgid "That is not a valid name, try again.\n" +msgstr "Това не е валидно име, опитайте отново.\n" + +#: apt-pkg/cdrom.cc:726 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Наименование на този диск: \n" +"„%s“\n" + +#: apt-pkg/cdrom.cc:730 +msgid "Copying package lists..." +msgstr "Копиране на списъците с пакети..." + +#: apt-pkg/cdrom.cc:754 +msgid "Writing new source list\n" +msgstr "Запазване на новия списък с източници\n" + +#: apt-pkg/cdrom.cc:763 +msgid "Source list entries for this disc are:\n" +msgstr "Записите в списъка с източници за този диск са:\n" + +#: apt-pkg/cdrom.cc:803 +msgid "Unmounting CD-ROM..." +msgstr "Демонтиране на CD-ROM..." + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "Записани са %i записа.\n" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "Записани са %i записа с %i липсващи файла.\n" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Записани са %i записа с %i несъответстващи файла\n" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" + +#: apt-pkg/deb/dpkgpm.cc:358 +#, c-format +msgid "Preparing %s" +msgstr "Подготвяне на %s" + +#: apt-pkg/deb/dpkgpm.cc:359 +#, c-format +msgid "Unpacking %s" +msgstr "Разпакетиране на %s" + +#: apt-pkg/deb/dpkgpm.cc:364 +#, c-format +msgid "Preparing to configure %s" +msgstr "Подготвяне на %s за конфигуриране" + +#: apt-pkg/deb/dpkgpm.cc:365 +#, c-format +msgid "Configuring %s" +msgstr "Конфигуриране на %s" + +#: apt-pkg/deb/dpkgpm.cc:366 +#, c-format +msgid "Installed %s" +msgstr "%s е инсталиран" + +#: apt-pkg/deb/dpkgpm.cc:371 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Подготвяне за премахване на %s" + +#: apt-pkg/deb/dpkgpm.cc:372 +#, c-format +msgid "Removing %s" +msgstr "Премахване на %s" + +#: apt-pkg/deb/dpkgpm.cc:373 +#, c-format +msgid "Removed %s" +msgstr "%s е премахнат" + +#: apt-pkg/deb/dpkgpm.cc:378 +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Подготвяне на %s за конфигуриране" + +#: apt-pkg/deb/dpkgpm.cc:379 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Неуспех при премахването на %s" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Връзката прекъсна преждевременно" + +#~ msgid "Reading file list" +#~ msgstr "Четене на списъка с файлове" + +#~ msgid "Could not execute " +#~ msgstr "Неуспех при изпълнението на " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Подготвяне на %s за премахване с конфигурационните файлове" + +#~ msgid "Removed with config %s" +#~ msgstr "%s е премахнат с конфигурационните файлове" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\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" @@ -145,14 +145,14 @@ msgstr "" msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -191,6 +191,18 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenti nisu u parovima" @@ -417,7 +429,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "" @@ -426,12 +438,12 @@ msgstr "" msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@ -531,223 +543,223 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ali nije instaliran" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ili" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -755,75 +767,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -831,79 +843,79 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -911,158 +923,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1263,7 +1280,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1316,7 +1333,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@ -1362,7 +1380,7 @@ msgstr "" msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Čitam spisak datoteke" @@ -1406,10 +1424,6 @@ msgstr "" msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1482,12 +1496,12 @@ msgstr "Datoteka nije pronađena" msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" @@ -1614,7 +1628,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1637,7 +1651,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1666,70 +1680,71 @@ msgstr "" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1745,76 +1760,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1827,7 +1842,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1948,7 +1963,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2106,62 +2121,62 @@ msgstr "Verzije kandidata" msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2205,11 +2220,18 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Čitam spisak datoteke" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2225,12 +2247,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2348,31 +2370,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, 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:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "" @@ -2515,13 +2541,13 @@ msgstr "Preporučuje" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" +msgid "Preparing to completely remove %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Ne mogu ukloniti %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" @@ -1,15 +1,15 @@ # Catalan translation of APT. -# Copyright © 2002, 2003, 2004, 2005 Software in the Public Interest, Inc. +# Copyright © 2002, 2003, 2004, 2005, 2006 Software in the Public Interest, Inc. # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003. # Matt Bonner <mateubonet@yahoo.com>, 2003. -# Jordi Mallach <jordi@debian.org>, 2004, 2005. +# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006. # msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-07-19 01:31+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -148,14 +148,14 @@ msgstr " Taula de versió:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -199,7 +199,7 @@ msgstr "" " apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n" "\n" "apt-cache és una eina usada per a manipular fitxers binaris en\n" -"el cau de APT, i així poder consultar-ne la informació\n" +"el cau d'APT, i així poder consultar-ne la informació\n" "\n" "Ordres:\n" " add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n" @@ -230,6 +230,18 @@ msgstr "" "Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 2.1r1 Disc 1»" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Inseriu un disc en la unitat i premeu Intro" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repetiu aquest procés per a la resta de CD del vostre joc." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Els arguments no són en parells" @@ -504,7 +516,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" @@ -513,12 +525,12 @@ msgstr "No es pot determinar l'estat de %s" msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" @@ -618,79 +630,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s" msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "però està instal·lat %s" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "però s'instal·larà %s" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "però no és instal·lable" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "però no està instal·lat" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "però no serà instal·lat" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "S'instal·laran els següents paquets NOUS:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "S'ELIMINARAN els següents paquets:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "S'han mantingut els següents paquets:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els següents paquets:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els següents paquets:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Es canviaran els següents paquets mantinguts:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -698,146 +710,146 @@ msgstr "" "AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instal·lar, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstal·lats, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a eliminar i %lu no actualitzats.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho usant -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, 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:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -848,28 +860,28 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -877,48 +889,48 @@ msgstr "" "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -929,50 +941,50 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -980,25 +992,25 @@ msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1006,7 +1018,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1018,7 +1030,7 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,119 +1040,124 @@ msgstr "" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, 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:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "S'està ometent el fitxer ja descarregat «%s»\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1149,7 +1166,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1158,32 +1175,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, 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:2294 +#: cmdline/apt-get.cc:2338 #, 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:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1297,9 +1314,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" -" '%s'\n" -"en la unitat de '%s' i premeu Intro\n" +"El medi ha canviat: inseriu el disc amb l'etiqueta\n" +" «%s»\n" +"en la unitat «%s» i premeu Intro\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1441,7 +1458,7 @@ msgstr "Fitxer de conf. duplicat %s/%s" msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -1494,7 +1511,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -1542,7 +1560,7 @@ msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" msgid "Internal error getting a package name" msgstr "S'ha produït un error intern en obtenir un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "S'està llegint el llistat de fitxers" @@ -1589,10 +1607,6 @@ msgstr "S'ha produït un error intern en afegir una desviació" msgid "The pkg cache must be initialized first" msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "S'està llegint la llista de fitxers" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1658,20 +1672,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fitxer no trobat" +msgstr "No s'ha trobat el disc" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1800,7 +1813,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1823,7 +1836,7 @@ msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'" msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "No es pot invocar" @@ -1852,73 +1865,74 @@ msgstr "No es pot iniciar la connexió amb %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "No s'ha pogut resoldre '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "No s'ha pogut executar " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " per a verificar la signatura (està instal·lat el gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Les següents signatures són invàlides:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1936,76 +1950,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s" msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Error intern" @@ -2018,7 +2032,7 @@ msgstr "No es pot transferir un fitxer buit a memòria" msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2061,7 +2075,7 @@ msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include aniuats" +msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format @@ -2139,7 +2153,7 @@ msgstr "Operació no vàlida %s" msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@ -2296,62 +2310,62 @@ msgstr "Versions candidates" msgid "Dependency generation" msgstr "Dependències que genera" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" @@ -2404,10 +2418,17 @@ msgstr "Falta el directori de llistes %spartial." msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "S'està baixant el fitxer %li de %li (falten %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "S'està llegint el llistat de fitxers" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2420,19 +2441,16 @@ msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" -" '%s'\n" -"en la unitat de '%s' i premeu Intro\n" +msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "El sistema d'empaquetament '%s' no està suportat." +msgstr "El sistema d'empaquetament '%s' no està suportat" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2556,11 +2574,15 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2570,16 +2592,16 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"No ha estat possible localitzar un fitxer pel paquet %s. Això podria " -"significar que haureu d'arreglar aquest paquet manualment." +"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " +"d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2587,9 +2609,9 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "Mida diferent" +msgstr "La mida no concorda" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2693,59 +2715,71 @@ msgstr "" "coincidents\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "S'està obrint %s" +msgstr "S'està preparant %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "S'està obrint %s" +msgstr "S'està desempaquetant %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "S'està obrint el fitxer de configuració %s" +msgstr "S'està preparant per a configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "S'està connectant amb %s" +msgstr "S'està configurant %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instal·lat: " +msgstr "S'ha instal·lat %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "S'està preparant per a l'eliminació de %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "S'està obrint %s" +msgstr "S'està eliminant %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomana" +msgstr "S'ha eliminat %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "S'està preparant per a configurar %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "No es pot eliminar %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "Reading file list" +#~ msgstr "S'està llegint la llista de fitxers" + +#~ msgid "Could not execute " +#~ msgstr "No s'ha pogut executar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "S'està preparant per a eliminar amb la configuració %s" + +#~ msgid "Removed with config %s" +#~ msgstr "S'ha eliminat amb la configuració %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s" @@ -1,15 +1,15 @@ # Czech translation of APT # This file is put in the public domain. -# Miroslav Kure <kurem@debian.cz>, 2004. +# Miroslav Kure <kurem@debian.cz>, 2004-2006. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-11 16:14+0100\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-05-14 18:36+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" -"Language-Team: Czech <provoz@debian.cz>\n" +"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -133,7 +133,7 @@ msgstr " Kandidát: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr " Vypíchnutý balík:" +msgstr " Vypíchnutý balík: " #. Show the priority tables #: cmdline/apt-cache.cc:1541 @@ -145,14 +145,14 @@ msgstr " Tabulka verzí:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -226,6 +226,18 @@ msgstr "" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Vložte prosím médium do mechaniky a stiskněte enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Tento proces opakujte pro všechna zbývající média." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nejsou v párech" @@ -320,7 +332,6 @@ msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -369,11 +380,11 @@ msgstr "" " generate konfiguračnísoubor [skupiny]\n" " clean konfiguračnísoubor\n" "\n" -"apt-ftparchive generuje indexové soubory debianích archívů. Podporuje\n" +"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n" "několik režimů vytváření - od plně automatického až po funkční ekvivalent\n" "příkazů dpkg-scanpackages a dpkg-scansources.\n" "\n" -"apt-ftparchive ze stromu .deb souborů vygeneruje soubory Packages. Soubor\n" +"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n" "Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n" "velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n" "vynutit hodnoty polí Priority a Section.\n" @@ -431,7 +442,7 @@ msgstr "Datum souboru se změnil %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Archív nemá kontrolní záznam" +msgstr "Archiv nemá kontrolní záznam" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -499,21 +510,21 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" #: ftparchive/writer.cc:386 msgid "Archive had no package field" -msgstr "Archív nemá pole Package" +msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" @@ -613,80 +624,79 @@ msgstr "Problém s odlinkováním %s" msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " nebo" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -694,224 +704,224 @@ 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!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalováno, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit `apt-get -f install'." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Vnitřní chyba při přidávání diverze" +msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Potřebuji stáhnout %sB/%sB archívů.\n" +msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Potřebuji stáhnout %sB archívů.\n" +msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku použito dalších %sB.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Na %s nemáte dostatek volného místa" +msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "Na %s nemáte dostatek volného místa." +msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Chystáte se vykonat něco potenciálně škodlivého\n" +"Chystáte se vykonat něco potenciálně škodlivého.\n" "Pro pokračování opište frázi '%s'\n" -" ?]" +" ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nemohu stáhnout některé archívy. Možná spusťte apt-get update nebo zkuste --" +"Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -922,49 +932,49 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -972,33 +982,33 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " +"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1009,7 +1019,7 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1019,124 +1029,128 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "Následujcící extra balíky budou instalovány:" +msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Propočítávám aktualizaci..." +msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Vnitřní chyba, AllUpgrade pokazil věci" +msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Přeskakuji dříve stažený soubor '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" +msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" +msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." -msgstr "Stažení některých archívů selhalo." +msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1145,31 +1159,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, 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:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1222,23 +1236,23 @@ msgstr "" " upgrade - Provede aktualizaci\n" " install - Instaluje nové balíky (balík je libc6, ne libc6.deb)\n" " remove - Odstraní balíky\n" -" source - Stáhne zdrojové archívy\n" -" build-dep - Configure build-dependencies for source packages\n" +" source - Stáhne zdrojové archivy\n" +" build-dep - Pro zdrojové balíky nastaví build-dependencies\n" " dist-upgrade - Aktualizace distribuce, viz apt-get(8)\n" " dselect-upgrade - Řídí se podle výběru v dselectu\n" -" clean - Smaže stažené archívy\n" -" autoclean - Smaže staré stažené archívy\n" +" clean - Smaže stažené archivy\n" +" autoclean - Smaže staré stažené archivy\n" " check - Ověří, zda se nevyskytují poškozené závislosti\n" "\n" "Volby:\n" " -h Tato nápověda\n" " -q Nezobrazí indikátor postupu - pro záznam\n" " -qq Nezobrazí nic než chyby\n" -" -d Pouze stáhne - neinstaluje ani nerozbaluje archívy\n" +" -d Pouze stáhne - neinstaluje ani nerozbaluje archivy\n" " -s Pouze simuluje prováděné akce\n" " -y Na všechny otázky odpovídá Ano\n" " -f Zkusí pokračovat, i když selže kontrola integrity\n" -" -m Zkusí pokračovat, i když se nepodaří najít archívy\n" +" -m Zkusí pokračovat, i když se nepodaří najít archivy\n" " -u Zobrazí také seznam aktualizovaných balíků\n" " -b Po stažení zdrojového balíku jej i zkompiluje\n" " -V Zobrazí čísla verzí\n" @@ -1258,11 +1272,11 @@ msgstr "Mám:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "Ign" +msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err" +msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format @@ -1272,7 +1286,7 @@ msgstr "Staženo %sB za %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr "[Pracuji]" +msgstr " [Pracuji]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1353,11 +1367,11 @@ msgstr "Selhalo spuštění gzipu " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" -msgstr "Porušený archív" +msgstr "Porušený archiv" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "Kontrolní součet taru selhal, archív je poškozený" +msgstr "Kontrolní součet taru selhal, archiv je poškozený" #: apt-inst/contrib/extracttar.cc:298 #, c-format @@ -1366,23 +1380,23 @@ msgstr "Neznámá hlavička TARu typ %u, člen %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "Neplatný podpis archívu" +msgstr "Neplatný podpis archivu" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Chyba při čtení záhlaví prvku archívu" +msgstr "Chyba při čtení záhlaví prvku archivu" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Neplatné záhlaví prvku archívu" +msgstr "Neplatné záhlaví prvku archivu" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" -msgstr "Archív je příliš krátký" +msgstr "Archiv je příliš krátký" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Chyba při čtení hlaviček archívu" +msgstr "Chyba při čtení hlaviček archivu" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1416,11 +1430,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Selhal zápis do souboru %s" +msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@ -1438,7 +1452,7 @@ msgstr "Rozbaluji %s vícekrát" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "Adresář %s je divertován" +msgstr "Adresář %s je odkloněn" #: apt-inst/extract.cc:147 #, c-format @@ -1473,7 +1487,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@ -1519,7 +1534,7 @@ msgstr "Nepodařilo se změnit na admin adresář %sinfo" msgid "Internal error getting a package name" msgstr "Vnitřní chyba při získávání jména balíku" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Čtu výpis souborů" @@ -1566,10 +1581,6 @@ msgstr "Vnitřní chyba při přidávání diverze" msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Čtu seznam souborů" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1588,12 +1599,12 @@ msgstr "Chyba při zpracování MD5. Offset %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Toto není platný DEB archív, chybí část '%s'" +msgstr "Toto není platný DEB archiv, chybí část '%s'" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Toto není platný DEB archív, neobsahuje část '%s' ani '%s'" +msgstr "Toto není platný DEB archiv, neobsahuje část '%s' ani '%s'" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1635,20 +1646,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Soubor nebyl nalezen" +msgstr "Disk nebyl nalezen." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1752,7 +1762,7 @@ msgstr "Nemohu naslouchat na socketu" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Nemohu určit jmého socketu" +msgstr "Nemohu určit jméno socketu" #: methods/ftp.cc:779 msgid "Unable to send PORT command" @@ -1776,7 +1786,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1799,7 +1809,7 @@ msgstr "Přenos dat selhal, server řekl '%s'" msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nemohu vyvolat " @@ -1828,75 +1838,77 @@ msgstr "Nemohu navázat spojení na %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nemohu přistoupit ke klíčence: '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Nemohu získat zámek %s" +msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Následujcící extra balíky budou instalovány:" +msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " +"klíč:\n" #: methods/gzip.cc:57 #, c-format @@ -1908,76 +1920,76 @@ msgstr "Nemohu otevřít rouru pro %s" msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Vnitřní chyba" @@ -1990,7 +2002,7 @@ msgstr "Nemohu provést mmap prázdného souboru" msgid "Couldn't make mmap of %lu bytes" msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" @@ -2100,7 +2112,7 @@ msgstr "Volba '%s' je příliš dlouhá" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Nechápu význam %s, zkuste true nebo false. " +msgstr "Nechápu význam %s, zkuste true nebo false." #: apt-pkg/contrib/cmndline.cc:351 #, c-format @@ -2112,7 +2124,7 @@ msgstr "Neplatná operace %s" msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" @@ -2269,62 +2281,62 @@ msgstr "Kandidátské verze" msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@ -2349,7 +2361,7 @@ msgstr "Indexový typ souboru '%s' není podporován" #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archív." +msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." #: apt-pkg/algorithms.cc:1059 msgid "" @@ -2373,10 +2385,17 @@ msgstr "Adresář seznamů %spartial chybí." msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Stahuji soubor %li z %li (%s zbývá)" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Stahuji soubor %li z %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2389,19 +2408,16 @@ msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Výměna média: Vložte disk nazvaný\n" -" '%s'\n" -"do mechaniky '%s' a stiskněte enter\n" +msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@ -2522,11 +2538,15 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2535,7 +2555,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2544,14 +2564,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2656,55 +2676,67 @@ msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Otevírám %s" +msgstr "Připravuji %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Otevírám %s" +msgstr "Rozbaluji %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Otevírám konfigurační soubor %s" +msgstr "Připravuji nastavení %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Připojuji se k %s" +msgstr "Nastavuji %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalovaná verze: " +msgstr "Nainstalován %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Připravuji odstranění %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Otevírám %s" +msgstr "Odstraňuji %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Doporučuje" +msgstr "Odstraněn %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "" +msgid "Preparing to completely remove %s" +msgstr "Připravuji úplné odstranění %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "" +msgid "Completely removed %s" +msgstr "Kompletně odstraněn %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" + +#~ msgid "Reading file list" +#~ msgstr "Čtu seznam souborů" + +#~ msgid "Could not execute " +#~ msgstr "Nemohu spustit " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Připravuji odstranění %s včetně konfiguračních souborů" + +#~ msgid "Removed with config %s" +#~ msgstr "Odstraněn %s včetně konfiguračního souboru" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\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" @@ -162,14 +162,14 @@ msgstr " Tabl Fersiynnau:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -244,6 +244,22 @@ msgstr "" " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" @@ -524,7 +540,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" @@ -533,12 +549,12 @@ msgstr "Methodd stat() o %s" msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" @@ -639,82 +655,82 @@ msgstr "Gwall wrth datgysylltu %s" msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -724,147 +740,147 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, 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:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,29 +891,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,49 +921,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,49 +975,49 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1009,27 +1025,27 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1038,7 +1054,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1051,7 +1067,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1060,117 +1076,122 @@ msgstr "" "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1200,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,34 +1209,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1477,7 +1498,7 @@ msgstr "Ffeil cyfluniad dyblyg %s/%s" msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -1532,7 +1553,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1581,7 +1603,7 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 #, fuzzy msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -1633,11 +1655,6 @@ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" -#: apt-inst/deb/dpkgdb.cc:386 -#, fuzzy -msgid "Reading file list" -msgstr "Yn Darllen Rhestr Ffeiliau" - #: apt-inst/deb/dpkgdb.cc:443 #, fuzzy, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1716,12 +1733,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1852,7 +1869,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1876,7 +1893,7 @@ msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1905,71 +1922,71 @@ msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Methwyd datrys '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Methwyd cael y clo %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1985,82 +2002,82 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:553 +#: methods/http.cc:585 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:568 +#: methods/http.cc:600 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:570 +#: methods/http.cc:602 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:836 +#: methods/http.cc:874 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1069 +#: methods/http.cc:1107 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Gwall mewnol" @@ -2073,7 +2090,7 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" @@ -2198,7 +2215,7 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -2362,63 +2379,63 @@ msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, fuzzy, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" @@ -2471,11 +2488,18 @@ msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." msgid "Archive directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Yn Darllen Rhestr Ffeiliau" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2494,12 +2518,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -2623,12 +2647,16 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + # FIXME: case -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2637,7 +2665,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2646,14 +2674,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2796,19 +2824,27 @@ msgid "Removed %s" msgstr "Argymell" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Yn agor y ffeil cyfluniad %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Methwyd dileu %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, fuzzy +#~ msgid "Reading file list" +#~ msgstr "Yn Darllen Rhestr Ffeiliau" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Methwyd cael y clo %s" + #~ msgid "Abort? [Y/n] " #~ msgstr "Erthylu? [I/n] " @@ -2,20 +2,20 @@ # translation of da.po to Danish # Advanced Package Transfer - APT message translation catalog # Danish messages -# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005. # +# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006. msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-08-30 10:18+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-20 22:23+0100\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@ -151,14 +151,14 @@ msgstr " Versionstabel:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat p %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -232,6 +232,18 @@ msgstr "" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Indst en disk i drevet og tryk retur" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Gentag processen for resten af cd'erne i dit st." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parametre ikke angivet i par" @@ -505,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" @@ -514,12 +526,12 @@ msgstr "Kunne ikke finde %s" msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" @@ -619,79 +631,79 @@ msgstr "Problem under aflnkning af %s" msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdbe %s til %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Flgende pakker har uopfyldte afhngigheder:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Flgende NYE pakker vil blive installeret:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Flgende pakker vil blive AFINSTALLERET:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Flgende pakker er blevet holdt tilbage:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Flgende pakker vil blive opgraderet:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Flgende pakker vil blive NEDGRADERET:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Flgende tilbageholdte pakker vil blive ndret:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -699,143 +711,143 @@ msgstr "" "ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br IKKE ske medmindre du er helt klar over, hvad du laver!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Retter afhngigheder..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhngigheder" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssttet" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhngigheder. Prv med -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Installr disse pakker uden verifikation (y/N)? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -846,28 +858,28 @@ msgstr "" "For at fortstte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -875,49 +887,49 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' " "eller prv med --fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understttes endnu ikke" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemrk, at %s vlges fremfor %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Du br eksplicit vlge en at installere." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -928,49 +940,49 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Dog kan flgende pakker erstatte den:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -978,25 +990,25 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1004,7 +1016,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1015,7 +1027,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1024,114 +1036,119 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Overspringer allerede hentet fil '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1139,7 +1156,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1148,32 +1165,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1430,7 +1447,7 @@ msgstr "Dobbelt opstningsfil %s/%s" msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -1483,7 +1500,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke lse %s" @@ -1529,7 +1547,7 @@ msgstr "Kunne ikke skifte til admin-mappen %sinfo" msgid "Internal error getting a package name" msgstr "Intern fejl under hentning af et pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lser fillisten" @@ -1576,10 +1594,6 @@ msgstr "Intern fejl under tilfjelse af omrokering" msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Indlser fillisten" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1646,20 +1660,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fil blev ikke fundet" +msgstr "Disk blev ikke fundet." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1787,7 +1800,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1810,7 +1823,7 @@ msgstr "Dataoverfrsel mislykkedes, serveren sagde '%s'" msgid "Query" msgstr "Foresprgsel" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Kunne ikke udfre " @@ -1839,75 +1852,77 @@ msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlb" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omstte navnet '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omstning af navnet '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Kunne ikke omstte navnet '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Stdte p mindst n ugyldig signatur." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Kunne ikke opn lsen %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " for at verificere signaturen (er gnupg installeret?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Ukendt fejl ved krsel af gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Flgende yderligere pakker vil blive installeret:" +msgstr "Flgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Flgende signaturer kunne ikke verificeret, da den offentlige ngle ikke er " +"tilgngelig:\n" #: methods/gzip.cc:57 #, c-format @@ -1919,77 +1934,77 @@ msgstr "Kunne ikke bne datarr for %s" msgid "Read error from %s process" msgstr "Lsefejl fra %s-process" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet p over %u tegn" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Intern fejl" @@ -2002,7 +2017,7 @@ msgstr "Kan ikke udfre mmap for en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udfre mmap for %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@ -2123,7 +2138,7 @@ msgstr "Ugyldig handling %s" msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@ -2280,62 +2295,62 @@ msgstr "Kandidatversioner" msgid "Dependency generation" msgstr "Afhngighedsgenerering" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "bner %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@ -2387,10 +2402,17 @@ msgstr "Listemappen %spartial mangler." msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Henter fil %li ud af %li (%s tilbage)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Lser fillisten" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2403,19 +2425,16 @@ msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Medieskift: Indst disken med navnet\n" -" '%s'\n" -"i drevet '%s' og tryk retur\n" +msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understttes ikke" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2535,11 +2554,16 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" +"Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2548,7 +2572,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2557,13 +2581,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2667,59 +2691,71 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "bner %s" +msgstr "Klargr %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "bner %s" +msgstr "Pakker %s ud" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "bner konfigurationsfilen %s" +msgstr "Gr klar til at stte %s op" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Forbinder til %s" +msgstr "Stter %s op" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Installeret: " +msgstr "Installerede %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Gr klar til afinstallation af %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "bner %s" +msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Anbefalede" +msgstr "Fjernede %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Gr klar til at stte %s op" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Kunne ikke slette %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#~ msgid "Reading file list" +#~ msgstr "Indlser fillisten" + +#~ msgid "Could not execute " +#~ msgstr "Kunne ikke kre " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Gr klar til at fjerne %s inklusive opstning" + +#~ msgid "Removed with config %s" +#~ msgstr "Fjernede %s inklusive opstning" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukendt leverandr-ID '%s' p linje %u i kildelisten %s" @@ -2809,9 +2845,6 @@ msgstr "Forbindelsen lukkedes for hurtigt" #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Kunne ikke omdbe %s.new til %s" -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "Indst en disk i drevet og tryk retur" - #~ msgid "I found (binary):" #~ msgstr "Jeg fandt (binre programfiler):" @@ -2829,15 +2862,9 @@ msgstr "Forbindelsen lukkedes for hurtigt" #~ msgstr "" #~ "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk" -#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -#~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" - #~ msgid " '" #~ msgstr " '" -#~ msgid "Repeat this process for the rest of the CDs in your set." -#~ msgstr "Gentag processen for resten af cd'erne i dit st." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: <de@li.org>\n" @@ -146,14 +146,14 @@ msgstr " Versions-Tabelle:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,21 @@ msgstr "" "tmp\n" "Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " +"Disk 1«" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumente nicht paarweise" @@ -513,7 +528,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Kann auf %s nicht zugreifen." @@ -522,12 +537,12 @@ msgstr "Kann auf %s nicht zugreifen." msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" @@ -627,79 +642,79 @@ msgstr "Problem beim Unlinking von %s" msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " oder " -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -708,147 +723,147 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Abhängigkeit werden korrigiert..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "Diese Pakete ohne Überprüfung installieren [y/N]? " +msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB Archive geholt werden.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -859,28 +874,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -888,48 +903,48 @@ msgstr "" "Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder " "mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wähle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -940,51 +955,51 @@ msgstr "" "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -992,27 +1007,27 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1035,7 @@ msgstr "" "Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1032,7 +1047,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,119 +1058,124 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1184,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1193,32 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1290,7 +1310,7 @@ msgstr "Hole:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "Ign " +msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " @@ -1459,7 +1479,7 @@ msgstr "Doppelte Konfigurationsdatei %s/%s" msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Konnte Datei %s nicht schließen" @@ -1512,7 +1532,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@ -1560,7 +1581,7 @@ msgid "Internal error getting a package name" msgstr "Interner Fehler beim Holen des Paket-Namens" #
-#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" @@ -1607,10 +1628,6 @@ msgstr "Interner Fehler beim Hinzufügen einer Umleitung" msgid "The pkg cache must be initialized first" msgstr "Der Paketcache muss erst initialisiert werden" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Paketlisten werden gelesen" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1687,12 +1704,12 @@ msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kann nicht zugreifen." -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@ -1821,7 +1838,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1844,7 +1861,7 @@ msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«" msgid "Query" msgstr "Abfrage" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Kann nicht aufrufen: " @@ -1874,71 +1891,71 @@ msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Konnte nicht mit %s:%s verbinden (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Konnte »%s« nicht auflösen" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kann nicht mit %s:%s verbinden:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Konnte »%s« nicht auflösen" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Konnte Lock %s nicht bekommen" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1954,78 +1971,78 @@ msgstr "Konnte keine Pipe für %s öffnen" msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Interner Fehler" @@ -2038,7 +2055,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden" msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2160,7 +2177,7 @@ msgstr "Ungültige Operation %s." msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@ -2317,62 +2334,62 @@ msgstr "Mögliche Versionen" msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kann Paketdatei %s nicht parsen (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@ -2424,11 +2441,19 @@ msgstr "Listenverzeichnis %spartial fehlt." msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#
+#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Paketlisten werden gelesen" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2447,12 +2472,12 @@ msgstr "" " »%s«\n" "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@ -2581,11 +2606,15 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2594,7 +2623,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2603,14 +2632,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2756,19 +2785,26 @@ msgid "Removed %s" msgstr "Empfiehlt" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Öffne Konfigurationsdatei %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Konnte %s nicht entfernen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" +#~ msgid "Reading file list" +#~ msgstr "Paketlisten werden gelesen" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Konnte Lock %s nicht bekommen" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" @@ -2861,10 +2897,6 @@ msgstr "Verbindung zu früh beendet" #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Konnte %s.new nicht in %s umbenennen" -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "" -#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" - #~ msgid "I found (binary):" #~ msgstr "Habe gefunden (binär):" @@ -2882,18 +2914,9 @@ msgstr "Verbindung zu früh beendet" #~ msgstr "" #~ "Konnte keine Paket-Dateien finden - vielleicht ist dies keine Debian-CD" -#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -#~ msgstr "" -#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " -#~ "Disk 1«" - #~ msgid " '" #~ msgstr " »" -#~ msgid "Repeat this process for the rest of the CDs in your set." -#~ msgstr "" -#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@ -1,3 +1,4 @@ +# translation of apt_po_el_new.po to Greek # translation of apt_po_el.po to # translation of apt_po_el.po to Greek # translation of apt_po_el.po to @@ -7,30 +8,31 @@ # Greek Translation of APT. # This file is put in the public domain. # Fanis Dokianakis <madf@hellug.gr>, 2003. -# Konstantinos Margaritis <markos@debian.org>, 2003, 2004. +# Konstantinos Margaritis <markos@debian.org>, 2003, 2004, 2006. # George Papamichelakis <george@step.gr>, 2004. # George Papamichalakis <george@step.gr>, 2004. # Greek Translation Team <debian-l10n-greek@lists.debian.org>, 2005. +# quad-nrg.net <galaxico@quad-nrg.net>, 2005. # msgid "" msgstr "" -"Project-Id-Version: apt_po_el\n" +"Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-07-14 14:25EEST\n" -"Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian." -"org>\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-18 15:16+0200\n" +"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "org>\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.10.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Το πακέτο %s έκδοσης %s έχει ανεπίλυτες εξαρτήσεις:\n" +msgstr "Το πακέτο %s με έκδοση %s έχει ανεπίλυτες εξαρτήσεις:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 @@ -159,14 +161,14 @@ msgstr " Πίνακας Έκδοσης:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -241,6 +243,19 @@ msgstr "" " -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n" "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Παρακαλώ δώστε ένα όνομα για τον δίσκο αυτό, όπως 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Τα ορίσματα δεν είναι σε ζεύγη" @@ -519,7 +534,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." @@ -528,12 +543,12 @@ msgstr "Αποτυχία εύρεσης της κατάστασης του %s." msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" @@ -633,80 +648,79 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s" msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " η" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -714,179 +728,180 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Ετοιμο" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" +msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." +"debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" +msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Πρόκειται να κάνετε κάτι εξαιρετικά επικίνδυνο\n" +"Πρόκειται να κάνετε κάτι πιθανόν πολύ επιζήμιο.\n" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -894,49 +909,49 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,51 +963,51 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το%s δεν βρέθηκε" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1000,25 +1015,25 @@ msgstr "" "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1026,7 +1041,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1038,7 +1053,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1048,118 +1063,124 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" +msgstr "" +"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " +"υλικό" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1167,7 +1188,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1176,32 +1197,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1256,9 +1277,9 @@ msgstr "" " install - Εγκατάσταση νέων πακέτων (χωρίς την επέκταση .deb)\n" " remove - Αφαίρεση πακέτων\n" " source - Μεταφόρτωση πακέτων πηγαίου κώδικα\n" -" build-dep - Ρύθμιση εξαρτήσεων χτισίματοςγια πακέτα πηγαίου κώδικα\n" +" build-dep - Ρύθμιση εξαρτήσεων χτισίματος για πακέτα πηγαίου κώδικα\n" " dist-upgrade - Αναβάθμιση διανομής, δες το apt-get(8)\n" -" dselect-upgrade - Ακολούθηση των επιλογών του dselect\n" +" dselect-upgrade - Τήρηση των επιλογών του dselect\n" " clean - Καθαρισμός των μεταφορτωμένων αρχείων\n" " autoclean - Καθαρισμός παλαιότερα μεταφορτωμένων αρχείων\n" " check - Εξακρίβωση για τυχόν σπασμένες εξαρτήσεις\n" @@ -1454,11 +1475,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Αποτυχία εγγραφής στο αρχείο %s" +msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" @@ -1511,7 +1532,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@ -1557,7 +1579,7 @@ msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο msgid "Internal error getting a package name" msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Ανάγνωση Λίστας Πακέτων" @@ -1601,13 +1623,8 @@ msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" -msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα" - -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Ανάγνωση Λιστών Αρχείων" +msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί" #: apt-inst/deb/dpkgdb.cc:443 #, c-format @@ -1674,20 +1691,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Το αρχείο Δε Βρέθηκε" +msgstr "Ο δίσκος δεν βρέθηκε." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1815,7 +1831,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1838,7 +1854,7 @@ msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο msgid "Query" msgstr "Επερώτηση" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" @@ -1867,75 +1883,78 @@ msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στ msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Αδύνατη η εύρεση του '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " +"αποτυπώματος?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Αδύνατο το κλείδωμα %s" +msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" +msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " +"διαθέσιμο το δημόσιο κλειδί:\n" #: methods/gzip.cc:57 #, c-format @@ -1947,77 +1966,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2030,7 +2049,7 @@ msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχ msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" @@ -2153,7 +2172,7 @@ msgstr "Μη έγκυρη λειτουργία %s" msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" @@ -2313,62 +2332,62 @@ msgstr "Υποψήφιες Εκδόσεις" msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος" +msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@ -2420,10 +2439,17 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται." msgid "Archive directory %spartial is missing." msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Ανάγνωση Λίστας Πακέτων" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2436,19 +2462,18 @@ msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" -" '%s'\n" -"στη συσκευή '%s' και πιέστε enter\n" +"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " +"enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" @@ -2490,39 +2515,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" #: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2540,14 +2565,14 @@ msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." #: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2572,11 +2597,15 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2585,7 +2614,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2594,7 +2623,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2602,7 +2631,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2706,55 +2735,67 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Άνοιγμα του %s" +msgstr "Προετοιμασία του %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Άνοιγμα του %s" +msgstr "Ξεπακετάρισμα του %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" +msgstr "Προετοιμασία ρύθμισης του %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Σύνδεση στο %s" +msgstr "Ρύθμιση του %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Εγκατεστημένα: " +msgstr "Εγκατέστησα το %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Προετοιμασία για την αφαίρεση του %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Άνοιγμα του %s" +msgstr "Αφαιρώ το %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Συστήνει" +msgstr "Αφαίρεσα το %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Προετοιμασία ρύθμισης του %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Αποτυχία διαγραφής του %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" + +#~ msgid "Reading file list" +#~ msgstr "Ανάγνωση Λιστών Αρχείων" + +#~ msgid "Could not execute " +#~ msgstr "Αδύνατη η εκτέλεση " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Προετοιμασία για αφαίρεση με ρύθμιση του %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Αφαίρεσα με ρύθμιση το %s" diff --git a/po/en_GB.po b/po/en_GB.po index 284bd61eb..0cc9ad7b2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -2,13 +2,14 @@ # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # Michael Piefel <piefel@informatik.hu-berlin.de>, 2002. # +# msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" -"Last-Translator: Michael Piefel <piefel@debian.org>\n" +"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,142 +18,142 @@ msgstr "" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "" +msgstr "Package %s version %s has an unmet dep:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "" +msgstr "Unable to locate package %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "" +msgstr "Total package names : " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " -msgstr "" +msgstr " Normal packages: " #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr "" +msgstr " Pure virtual packages: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr "" +msgstr " Single virtual packages: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " -msgstr "" +msgstr " Mixed virtual packages: " #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr "" +msgstr " Missing: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "" +msgstr "Total distinct versions: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "" +msgstr "Total dependencies: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " -msgstr "" +msgstr "Total ver/file relations: " #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "" +msgstr "Total Provides mappings: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "" +msgstr "Total globbed strings: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "" +msgstr "Total dependency version space: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "" +msgstr "Total slack space: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "" +msgstr "Total space accounted for: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "" +msgstr "Package file %s is out of sync." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "" +msgstr "You must give exactly one pattern" #: cmdline/apt-cache.cc:1385 msgid "No packages found" -msgstr "" +msgstr "No packages found" #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "" +msgstr "Package files:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "" +msgstr "Cache is out of sync, can't x-ref a package file" #: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" -msgstr "" +msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "" +msgstr "Pinned packages:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "" +msgstr "(not found)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr "" +msgstr " Installed: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" -msgstr "" +msgstr "(none)" #. Candidate Version #: cmdline/apt-cache.cc:1522 msgid " Candidate: " -msgstr "" +msgstr " Candidate: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr "" +msgstr " Package pin: " #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr "" +msgstr " Version table:" #: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" -msgstr "" +msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "" +msgstr "%s %s for %s %s compiled on %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -190,10 +191,57 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Please insert a Disc in the drive and press enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repeat this process for the rest of the CDs in your set." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "" +msgstr "Arguments not in pairs" #: cmdline/apt-config.cc:76 msgid "" @@ -210,11 +258,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "" +msgstr "%s not a valid DEB package." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -229,44 +289,51 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" -msgstr "" +msgstr "Unable to write to %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "" +msgstr "Cannot get debconf version. Is debconf installed?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 -#, fuzzy msgid "Package extension list is too long" -msgstr "Option ‘%s’ is too long" +msgstr "Package extension list is too long" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" -msgstr "" +msgstr "Error processing directory %s" #: ftparchive/apt-ftparchive.cc:254 -#, fuzzy msgid "Source extension list is too long" -msgstr "Option ‘%s’ is too long" +msgstr "Source extension list is too long" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "" +msgstr "Error writing header to contents file" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "" +msgstr "Error processing contents %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -311,6 +378,7 @@ msgstr "" "Commands: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" +" release path\n" " generate config [groups]\n" " clean config\n" "\n" @@ -326,7 +394,7 @@ msgstr "" "Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" "The --source-override option can be used to specify a src override file\n" "\n" -"The ‘packages’ and ‘sources’ command should be run in the root of the\n" +"The 'packages' and 'sources' command should be run in the root of the\n" "tree. BinaryPath should point to the base of the recursive search and \n" "override file should contain the override flags. Pathprefix is\n" "appended to the filename fields if present. Example usage from the \n" @@ -347,7 +415,7 @@ msgstr "" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "" +msgstr "No selections matched" #: ftparchive/apt-ftparchive.cc:835 #, c-format @@ -357,423 +425,425 @@ msgstr "Some files are missing in the package file group ‘%s’" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "" +msgstr "DB was corrupted, file renamed to %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "" +msgstr "DB is old, attempting to upgrade %s" #: ftparchive/cachedb.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to open DB file %s: %s" -msgstr "Unable to fetch file, server said ‘%s’" +msgstr "Unable to open DB file %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "" +msgstr "File date has changed %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "" +msgstr "Archive has no control record" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" -msgstr "" +msgstr "Unable to get a cursor" #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "" +msgstr "W: Unable to read directory %s\n" #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" -msgstr "" +msgstr "W: Unable to stat %s\n" #: ftparchive/writer.cc:125 msgid "E: " -msgstr "" +msgstr "E:" #: ftparchive/writer.cc:127 msgid "W: " -msgstr "" +msgstr "W:" #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "" +msgstr "E: Errors apply to file " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 -#, fuzzy, c-format +#, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "" +msgstr "Tree walking failed" #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" -msgstr "" +msgstr "Failed to open %s" #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" -msgstr "" +msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "" +msgstr "Failed to readlink %s" #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "" +msgstr "Failed to unlink %s" #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "" +msgstr "*** Failed to link %s to %s" #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr "" +msgstr " DeLink limit of %sB hit.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" -msgstr "" +msgstr "Failed to stat %s" #: ftparchive/writer.cc:386 msgid "Archive had no package field" -msgstr "" +msgstr "Archive had no package field" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" -msgstr "" +msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr "" +msgstr " %s maintainer is %s not %s\n" #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "" +msgstr "Internal error, could not locate member %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "" +msgstr "realloc - Failed to allocate memory" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" -msgstr "" +msgstr "Unable to open %s" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "" +msgstr "Malformed override %s line %lu #1" #: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "" +msgstr "Malformed override %s line %lu #2" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "" +msgstr "Malformed override %s line %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "" +msgstr "Failed to read the override file %s" #: ftparchive/multicompress.cc:75 -#, fuzzy, c-format +#, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Unknown Compression Algorithm ‘%s’" +msgstr "Unknown compression algorithm ‘%s’" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "" +msgstr "Compressed output %s needs a compression set" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "" +msgstr "Failed to create IPC pipe to subprocess" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "" +msgstr "Failed to create FILE*" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "" +msgstr "Failed to fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "" +msgstr "Compress child" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "" +msgstr "Internal error, failed to create %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "" +msgstr "Failed to create subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "" +msgstr "Failed to exec compressor" #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "" +msgstr "decompressor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "" +msgstr "IO to subprocess/file failed" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "" +msgstr "Failed to read while computing MD5" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "" +msgstr "Problem unlinking %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "" +msgstr "Failed to rename %s to %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" -msgstr "" +msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" -msgstr "" +msgstr "Regex compilation error - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" -msgstr "" +msgstr "The following packages have unmet dependencies." -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" -msgstr "" +msgstr "but %s is installed" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" -msgstr "" +msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" -msgstr "" +msgstr "but it is not installable" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" -msgstr "" +msgstr "but it is a virtual package" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" -msgstr "" +msgstr "but it is not installed" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" -msgstr "" +msgstr "but it is not going to be installed" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" -msgstr "" +msgstr "or" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "" +msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "" +msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "" +msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "" +msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "" +msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "" +msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " -msgstr "" +msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "" +msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "" +msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " -msgstr "" +msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "" +msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "" +msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." -msgstr "" +msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." -msgstr "" +msgstr " failed." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" -msgstr "" +msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "" +msgstr "Unable to minimize the upgrade set" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" -msgstr "" +msgstr "Done" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." -msgstr "" +msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "" +msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "" +msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "" +msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" -msgstr "" +msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "" +msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "" +msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" -msgstr "" +msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "" +msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "" +msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "" +msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" +msgstr "After unpacking %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "" +msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" -msgstr "" +msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "" +msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" +msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" -msgstr "" +msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@ -783,148 +853,155 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." -msgstr "" +msgstr "Abort." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " -msgstr "" +msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "" +msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" -msgstr "" +msgstr "Some files failed to download" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" -msgstr "" +msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "" +msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." -msgstr "" +msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." -msgstr "" +msgstr "Aborting install." -#: cmdline/apt-get.cc:1028 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1030 +#, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "" +msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "" +msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "" +msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" -msgstr "" +msgstr " [Installed]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "" +msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "" +msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "" +msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" +msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" -msgstr "" +msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "" +msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" -msgstr "" +msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" -msgstr "" +msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" -msgstr "" +msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" -msgstr "" +msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -932,166 +1009,183 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "" +msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" -msgstr "" +msgstr "Broken packages" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "" +msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" -msgstr "" +msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" -msgstr "" +msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "" +msgstr "Calculating upgrade..." -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "" +msgstr "Failed" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" -msgstr "" +msgstr "Done" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "" +msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" -msgstr "" +msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" -msgstr "" +msgstr "Unable to find a source package for %s" + +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" -msgstr "" +msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "" +msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "" +msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" -msgstr "" +msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." -msgstr "" +msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "" +msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" -msgstr "" +msgstr "Child process failed" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" -msgstr "" +msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "" +msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" -msgstr "" +msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" +"Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "" +msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" +msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" -msgstr "" +msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" -msgstr "" +msgstr "Supported modules:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1132,35 +1226,73 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "" +msgstr "Hit " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "" +msgstr "Get: " #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "" +msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "" +msgstr "Err" #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Fetched %sB in %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr "" +msgstr " [Working]" #: cmdline/acqprogress.cc:271 -#, fuzzy, c-format +#, c-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" @@ -1172,7 +1304,7 @@ msgstr "" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "" +msgstr "Unknown package record!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1187,216 +1319,228 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "" +msgstr "Bad default setting!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 msgid "Press enter to continue." -msgstr "" +msgstr "Press enter to continue." #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "" +msgstr "Some errors occurred while unpacking. I'm going to configure the" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "" +msgstr "packages that were installed. This may result in duplicate errors" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" +msgstr "or errors caused by missing dependencies. This is OK, only the errors" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" +"above this message are important. Please fix them and run [I]nstall again" #: dselect/update:30 msgid "Merging available information" -msgstr "" +msgstr "Merging available information" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "" +msgstr "Failed to create pipes" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "" +msgstr "Failed to exec gzip " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" -msgstr "" +msgstr "Corrupted archive" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "" +msgstr "Tar checksum failed, archive corrupted" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "" +msgstr "Unknown TAR header type %u, member %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "" +msgstr "Invalid archive signature" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "" +msgstr "Error reading archive member header" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "" +msgstr "Invalid archive member header" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" -msgstr "" +msgstr "Archive is too short" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "" +msgstr "Failed to read the archive headers" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "" +msgstr "DropNode called on still linked node" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "" +msgstr "Failed to locate the hash element!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "" +msgstr "Failed to allocate diversion" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "" +msgstr "Internal error in AddDiversion" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "" +msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "" +msgstr "Double add of diversion %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "" +msgstr "Duplicate conf file %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Could not resolve ‘%s’" +msgstr "Failed to write file ‘%s’" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" -msgstr "" +msgstr "Failed to close file %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" -msgstr "" +msgstr "The path %s is too long" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "" +msgstr "Unpacking %s more than once" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "" +msgstr "The directory %s is diverted" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "" +msgstr "The package is trying to write to the diversion target %s/%s" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" -msgstr "" +msgstr "The diversion path is too long" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "" +msgstr "The directory %s is being replaced by a non-directory" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "" +msgstr "Failed to locate node in its hash bucket" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "" +msgstr "The path is too long" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "" +msgstr "Overwrite package match with no version for %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "" +msgstr "File %s/%s overwrites the one in the package %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" -msgstr "" +msgstr "Unable to read %s" #: apt-inst/extract.cc:494 #, c-format msgid "Unable to stat %s" -msgstr "" +msgstr "Unable to stat %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "" +msgstr "Failed to remove %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" -msgstr "" +msgstr "Unable to create %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "" +msgstr "Failed to stat %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "" +msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 msgid "Reading package lists" -msgstr "" +msgstr "Reading package lists" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "" +msgstr "Failed to change to the admin dir %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "" +msgstr "Internal error getting a package name" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" -msgstr "" +msgstr "Reading file listing" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1412,53 +1556,49 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "" +msgstr "Failed reading the list file %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "" +msgstr "Internal error getting a node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "" +msgstr "Failed to open the diversions file %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "" +msgstr "The diversion file is corrupted" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "" +msgstr "Invalid line in the diversion file: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "" +msgstr "Internal error adding a diversion" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" +msgstr "The pkg cache must be initialized first" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "" +msgstr "Failed to find a Package: header, offset %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "" +msgstr "Bad ConfFile section in the status file. Offset %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "" +msgstr "Error parsing MD5. Offset %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format @@ -1466,101 +1606,105 @@ msgid "This is not a valid DEB archive, missing '%s' member" msgstr "This is not a valid DEB archive, missing ‘%s’ member" #: apt-inst/deb/debfile.cc:52 -#, fuzzy, c-format +#, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "This is not a valid DEB archive, missing ‘%s’ member" +msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member" #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" -msgstr "" +msgstr "Couldn't change to %s" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "" +msgstr "Internal error, could not locate member" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "" +msgstr "Failed to locate a valid control file" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "" +msgstr "Unparsable control file" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "" +msgstr "Unable to read the cdrom database %s" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "" +msgstr "Wrong CD-ROM" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" +msgstr "Unable to unmount the CD-ROM in %s, it may still be in use." #: methods/cdrom.cc:169 msgid "Disk not found." -msgstr "" +msgstr "Disk not found." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "" +msgstr "File not found" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" -msgstr "" +msgstr "Failed to stat" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "" +msgstr "Failed to set modification time" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "" +msgstr "Invalid URI, local URIS must not start with //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "" +msgstr "Logging in" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "" +msgstr "Unable to determine the peer name" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "" +msgstr "Unable to determine the local name" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "" +msgstr "The server refused the connection and said: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "" +msgstr "USER failed, server said: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "" +msgstr "PASS failed, server said: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." #: methods/ftp.cc:265 #, c-format @@ -1570,85 +1714,85 @@ msgstr "Login script command ‘%s’ failed, server said: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "" +msgstr "TYPE failed, server said: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "" +msgstr "Connection timeout" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "" +msgstr "Server closed the connection" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" -msgstr "" +msgstr "Read error" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "" +msgstr "A response overflowed the buffer." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "" +msgstr "Protocol corruption" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" -msgstr "" +msgstr "Write error" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "" +msgstr "could not create a socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" +msgstr "Could not connect data socket, connection timed out" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "" +msgstr "Could not connect, passive socket." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "" +msgstr "getaddrinfo was unable to get a listening socket" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "" +msgstr "Could not bind a socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "" +msgstr "Could not listen on the socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "" +msgstr "Could not determine the name of the socket" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "" +msgstr "Unable to send PORT command" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "" +msgstr "Unknown address family %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "" +msgstr "EPRT failed, server said: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "" +msgstr "Data socket connect timed out" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "" +msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "" +msgstr "Problem hashing file" #: methods/ftp.cc:877 #, c-format @@ -1657,7 +1801,7 @@ msgstr "Unable to fetch file, server said ‘%s’" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "" +msgstr "Data socket timed out" #: methods/ftp.cc:922 #, c-format @@ -1667,202 +1811,205 @@ msgstr "Data transfer failed, server said ‘%s’" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "" +msgstr "Query" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "" +msgstr "Unable to invoke" #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "" +msgstr "Connecting to %s (%s)" #: methods/connect.cc:71 #, c-format msgid "[IP: %s %s]" -msgstr "" +msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "" +msgstr "Could not create a socket for %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "" +msgstr "Cannot initiate the connection to %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "" +msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "" +msgstr "Could not connect to %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "" +msgstr "Connecting to %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "" +msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Could not resolve ‘%s’" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "At least one invalid signature was encountered." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Could not resolve ‘%s’" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " to verify signature (is gnupg installed?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "" +msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" -msgstr "" +msgstr "Couldn't open pipe for %s" #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" -msgstr "" +msgstr "Read error from %s process" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" -msgstr "" +msgstr "Waiting for headers" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "" +msgstr "Got a single header line over %u chars" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" -msgstr "" +msgstr "Bad header line" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "" +msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" +msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" +msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" -msgstr "" +msgstr "This HTTP server has broken range support" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" -msgstr "" +msgstr "Unknown date format" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" -msgstr "" +msgstr "Select failed" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" -msgstr "" +msgstr "Connection timed out" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" -msgstr "" +msgstr "Error writing to output file" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" -msgstr "" +msgstr "Error writing to file" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" -msgstr "" +msgstr "Error writing to the file" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" -msgstr "" +msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" -msgstr "" +msgstr "Error reading from server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" -msgstr "" +msgstr "Bad header data" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" -msgstr "" +msgstr "Connection failed" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" -msgstr "" +msgstr "Internal error" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "" +msgstr "Cannot mmap an empty file" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "" +msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" -msgstr "" +msgstr "Selection %s not found" #: apt-pkg/contrib/configuration.cc:436 #, c-format @@ -1872,42 +2019,42 @@ msgstr "Unrecognized type abbreviation: ‘%c’" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "" +msgstr "Opening configuration file %s" #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" -msgstr "" +msgstr "Line %d too long (max %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" +msgstr "Syntax error %s:%u: Block starts with no name." #: apt-pkg/contrib/configuration.cc:627 -#, fuzzy, c-format +#, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" +msgstr "Syntax error %s:%u: Malformed tag" #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "" +msgstr "Syntax error %s:%u: Extra junk after value" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" +msgstr "Syntax error %s:%u: Directives can only be done at the top level" #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" +msgstr "Syntax error %s:%u: Too many nested includes" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "" +msgstr "Syntax error %s:%u: Included from here" #: apt-pkg/contrib/configuration.cc:704 #, c-format @@ -1917,17 +2064,17 @@ msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgstr "Syntax error %s:%u: Extra junk at end of file" #: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Error!" -msgstr "" +msgstr "%c%s... Error!" #: apt-pkg/contrib/progress.cc:156 #, c-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Done" #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@ -1938,22 +2085,22 @@ msgstr "Command line option ‘%c’ [from %s] is not known." #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "" +msgstr "Command line option %s is not understood" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "" +msgstr "Command line option %s is not boolean" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "" +msgstr "Option %s requires an argument." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "" +msgstr "Option %s: Configuration item specification must have an =<val>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -1968,234 +2115,234 @@ msgstr "Option ‘%s’ is too long" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "" +msgstr "Sense %s is not understood, try true or false." #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr "" +msgstr "Invalid operation %s" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "" +msgstr "Unable to stat the mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" -msgstr "" +msgstr "Unable to change to %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "" +msgstr "Failed to stat the cdrom" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "" +msgstr "Not using locking for read only lock file %s" #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "" +msgstr "Could not open lock file %s" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "" +msgstr "Not using locking for nfs mounted lock file %s" #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" -msgstr "" +msgstr "Could not get lock %s" #: apt-pkg/contrib/fileutl.cc:377 -#, fuzzy, c-format +#, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "" +msgstr "Sub-process %s received a segmentation fault." #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "" +msgstr "Sub-process %s returned an error code (%u)" #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "" +msgstr "Sub-process %s exited unexpectedly" #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "" +msgstr "Could not open file %s" #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" -msgstr "" +msgstr "read, still have %lu to read but none left" #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "" +msgstr "write, still have %lu to write but couldn't" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "" +msgstr "Problem closing the file" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "" +msgstr "Problem unlinking the file" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "" +msgstr "Problem syncing the file" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" -msgstr "" +msgstr "Empty package cache" #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "" +msgstr "The package cache file is corrupted" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "" +msgstr "The package cache file is an incompatible version" #: apt-pkg/pkgcache.cc:142 -#, fuzzy, c-format +#, c-format msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" #: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" -msgstr "" +msgstr "The package cache was built for a different architecture" #: apt-pkg/pkgcache.cc:218 msgid "Depends" -msgstr "" +msgstr "Depends" #: apt-pkg/pkgcache.cc:218 msgid "PreDepends" -msgstr "" +msgstr "PreDepends" #: apt-pkg/pkgcache.cc:218 msgid "Suggests" -msgstr "" +msgstr "Suggests" #: apt-pkg/pkgcache.cc:219 msgid "Recommends" -msgstr "" +msgstr "Recommends" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "" +msgstr "Conflicts" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" -msgstr "" +msgstr "Replaces" #: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" -msgstr "" +msgstr "Obsoletes" #: apt-pkg/pkgcache.cc:231 msgid "important" -msgstr "" +msgstr "important" #: apt-pkg/pkgcache.cc:231 msgid "required" -msgstr "" +msgstr "required" #: apt-pkg/pkgcache.cc:231 msgid "standard" -msgstr "" +msgstr "standard" #: apt-pkg/pkgcache.cc:232 msgid "optional" -msgstr "" +msgstr "optional" #: apt-pkg/pkgcache.cc:232 msgid "extra" -msgstr "" +msgstr "extra" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" -msgstr "" +msgstr "Building dependency tree" #: apt-pkg/depcache.cc:61 msgid "Candidate versions" -msgstr "" +msgstr "Candidate versions" #: apt-pkg/depcache.cc:90 msgid "Dependency generation" -msgstr "" +msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "" +msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "" +msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "" +msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "" +msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "" +msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" +msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" +msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" -msgstr "" +msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "" +msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "" +msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, fuzzy, c-format +#: apt-pkg/sourcelist.cc:244 +#, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Type ‘%s’ is not known in on line %u in source list %s" +msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "" +msgstr "Malformed line %u in source list %s (vendor id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2204,6 +2351,9 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2215,63 +2365,71 @@ msgstr "Index file type ‘%s’ is not supported" msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" +"The package %s needs to be reinstalled, but I can't find an archive for it." #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "" +msgstr "Unable to correct problems, you have held broken packages." #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." -msgstr "" +msgstr "Lists directory %spartial is missing." #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "" +msgstr "Archive directory %spartial is missing." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Downloading file %li of %li (%s remaining)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Reading file listing" #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." -msgstr "" +msgstr "The method driver %s could not be found." #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" -msgstr "" +msgstr "Method %s did not start correctly" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Media Change: Please insert the disc labelled\n" -" ‘%s’\n" -"in the drive ‘%s’ and press enter\n" +"Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" -msgstr "" +msgstr "Unable to determine a suitable packaging system type" #: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." -msgstr "" +msgstr "Unable to stat %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" @@ -2279,141 +2437,150 @@ msgstr "You must put some ‘source’ URIs in your sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." -msgstr "" +msgstr "The package lists or status file could not be parsed or opened." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" +msgstr "You may want to run apt-get update to correct these problems" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" -msgstr "" +msgstr "Invalid record in the preferences file, no Package header" #: apt-pkg/policy.cc:291 #, c-format msgid "Did not understand pin type %s" -msgstr "" +msgstr "Did not understand pin type %s" #: apt-pkg/policy.cc:299 msgid "No priority (or zero) specified for pin" -msgstr "" +msgstr "No priority (or zero) specified for pin" #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" -msgstr "" +msgstr "Cache has an incompatible versioning system" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "" +msgstr "Error occurred while processing %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "" +msgstr "Error occurred while processing %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "" +msgstr "Error occurred while processing %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "" +msgstr "Error occurred while processing %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "" +msgstr "Error occurred while processing %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "" +msgstr "Error occurred while processing %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "" +msgstr "Error occurred while processing %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" +msgstr "Wow, you exceeded the number of package names this APT can handle.." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" +msgstr "Wow, you exceeded the number of versions this APT can handle." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" +msgstr "Wow, you exceeded the number of dependencies this APT can handle." #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "" +msgstr "Error occurred while processing %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "" +msgstr "Error occurred while processing %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "" +msgstr "Package %s %s was not found while processing file dependencies" #: apt-pkg/pkgcachegen.cc:574 #, c-format msgid "Couldn't stat source package list %s" -msgstr "" +msgstr "Couldn't stat source package list %s" #: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" -msgstr "" +msgstr "Collecting File Provides" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "" +msgstr "IO Error saving source cache" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "" +msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" +msgstr "MD5Sum mismatch" + +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:753 #, 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 "" +"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)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" +"The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "" +msgstr "Size mismatch" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "" +msgstr "Vendor block %s contains no fingerprint" #: apt-pkg/cdrom.cc:507 #, c-format @@ -2421,46 +2588,48 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "" +msgstr "Identifying.. " #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "" +msgstr "Stored label: %s \n" #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "" +msgstr "Using CD-ROM mount point %s\n" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "" +msgstr "Unmounting CD-ROM\n" #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" -msgstr "" +msgstr "Waiting for disc...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "" +msgstr "Mounting CD-ROM...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "" +msgstr "Scanning disc for index files..\n" #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "" +msgstr "Found %i package indexes, %i source indexes and %i signatures\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "" +msgstr "That is not a valid name, try again.\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2468,96 +2637,110 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" +"This disc is called: \n" +"'%s'\n" #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." -msgstr "" +msgstr "Copying package lists..." #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" -msgstr "" +msgstr "Writing new source list\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "" +msgstr "Source list entries for this disc are:\n" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "" +msgstr "Unmounting CD-ROM..." #: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" -msgstr "" +msgstr "Wrote %i records.\n" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "" +msgstr "Wrote %i records with %i missing files.\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "" +msgstr "Wrote %i records with %i mismatched files\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" +msgstr "Wrote %i records with %i missing files and %i mismatched files\n" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Preparing %s" -msgstr "" +msgstr "Preparing %s" #: apt-pkg/deb/dpkgpm.cc:359 #, c-format msgid "Unpacking %s" -msgstr "" +msgstr "Unpacking %s" #: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Preparing to configure %s" -msgstr "" +msgstr "Preparing to configure %s" #: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Configuring %s" -msgstr "" +msgstr "Configuring %s" #: apt-pkg/deb/dpkgpm.cc:366 #, c-format msgid "Installed %s" -msgstr "" +msgstr "Installed %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Preparing for removal of %s" #: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removing %s" -msgstr "" +msgstr "Removing %s" #: apt-pkg/deb/dpkgpm.cc:373 #, c-format msgid "Removed %s" -msgstr "" +msgstr "Removed %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparing to configure %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Failed to remove %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "" +msgstr "Connection closed prematurely" + +#~ msgid "Reading file list" +#~ msgstr "Reading file list" + +#~ msgid "Could not execute " +#~ msgstr "Could not execute " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Preparing for remove with config %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Removed with config %s" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s" @@ -2580,9 +2763,6 @@ msgstr "" #~ msgid "-> '" #~ msgstr "-> ‘" -#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -#~ msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’" - #~ msgid " '" #~ msgstr " ‘" @@ -6,10 +6,10 @@ # Rubn Porras Campo <nahoo@inicia.es> 2004
msgid "" msgstr "" -"Project-Id-Version: apt 0.5.24\n" +"Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-08 20:36+0100\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2005-11-16 17:37+0100\n" "Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -149,14 +149,14 @@ msgstr " Tabla de versin:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -232,6 +232,19 @@ msgstr "" "cache=/tmp\n" "Vea las pginas del manual apt-cache(8) y apt.conf(5) para ms informacin.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Por favor inserte un disco en la unidad y presione Intro" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repita este proceso para el resto de los CDs del conjunto." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos no emparejados" @@ -329,7 +342,6 @@ msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -371,12 +383,12 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" "Uso: apt-ftparchive [opciones] orden\n" -"Comandos: packages trayectoria-binaria [archivo-sobrepaso\n" -" [prefijo-trayectoria]]\n" -" sources trayectoria-fuente [archivo-sobrepaso \n" -" [prefijo-trayectoria]]\n" -" contents trayectoria\n" -" release trayectoria\n" +"Comandos: packages ruta-binaria [archivo-predominio\n" +" [prefijo-ruta]]\n" +" sources ruta-fuente [archivo-predominio \n" +" [prefijo-ruta]]\n" +" contents ruta\n" +" release ruta\n" " generate config [grupos]\n" " clean config\n" "\n" @@ -386,7 +398,7 @@ msgstr "" "\n" "apt-ftparchive genera ficheros Package de un rbol de .debs. El fichero\n" "Package contiene los contenidos de todos los campos de control de cada\n" -"paquete al igual que la suma MD5 y el tamao del archivo. Se soporta\n" +"paquete al igual que la suma MD5 y el tamao del archivo. Se puede usar\n" "un archivo de predominio para forzar el valor de Priority y\n" "Section.\n" "\n" @@ -394,7 +406,7 @@ msgstr "" ".dscs. Se puede utilizar la opcin --source-override para especificar un\n" "fichero de predominio de fuente.\n" "\n" -"Las rdenes 'packages' y 'sources' deben ejecutarse en la raz del\n" +"Las rdenes packages y sources deben ejecutarse en la raz del\n" "rbol. BinaryPath debe apuntar a la base de la bsqueda\n" "recursiva, y el archivo de predominio debe de contener banderas de\n" "predominio. Se aade Pathprefix a los campos de nombre de fichero\n" @@ -410,7 +422,7 @@ msgstr "" " -q Silencioso\n" " -d=? Selecciona la base de datos de cach opcional \n" " --no-delink Habilita modo de depuracin delink\n" -" --contents Generacin del contenido del archivo 'Control'\n" +" --contents Generacin del contenido del archivo Control\n" " -c=? Lee este archivo de configuracin\n" " -o=? Establece una opcin de configuracin arbitraria" @@ -513,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" @@ -522,12 +534,12 @@ msgstr "No pude leer %s" msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" @@ -627,259 +639,258 @@ msgstr "Hay problemas desligando %s" msgid "Failed to rename %s to %s" msgstr "Fall el renombre de %s a %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "pero %s est instalado" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "pero no es instalable" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "pero no est instalado" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Se instalarn los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARN:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Se actualizarn los siguientes paquetes:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARN los siguientes paquetes:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Se cambiarn los siguientes paquetes retenidos:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVISO: Se van a eliminar los siguientes paquetes esenciales\n" -"Esto NO debe hacerse a menos que sepa exactamente lo que est haciendo!" +"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" +"NO debe hacerse a menos que sepa exactamente lo que est haciendo!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarn, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " fall." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualizacin" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Aviso de autenticacin ignorado.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estos paquetes sin verificacin [s/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utiliz -y sin --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro.. Los tamaos no concuerdan, mande un correo a \n" "apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de desempaquetar.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especific Trivial Only pero sta no es una operacin trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "Est a punto de hacer algo potencialmente daino\n" -"Para continuar escriba la frase '%s'\n" +"Para continuar escriba la frase %s\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -887,47 +898,47 @@ msgstr "" "No se pudieron obtener algunos archivos, quizs deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Abortando la instalacin." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminar\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explcitamente uno para instalar." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -938,49 +949,49 @@ msgstr "" "a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalacin" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya est en su versin ms reciente.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontr la Distribucin '%s' para '%s'" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontr la versin '%s' para '%s'" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -988,25 +999,25 @@ msgstr "" "Algunos archivos de ndice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1025,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1026,7 +1037,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,118 +1047,123 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, 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:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1156,7 +1172,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,32 +1181,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, 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:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1447,11 +1463,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuracin duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Fall el cierre del archivo %s" +msgstr "Fall la escritura del archivo %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -1504,7 +1520,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -1551,7 +1568,7 @@ msgstr "No pude cambiarme al directorio de administracin %sinfo" msgid "Internal error getting a package name" msgstr "Error interno obteniendo un Nombre de Paquete" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Leyendo Listado de Archivos" @@ -1598,10 +1615,6 @@ msgstr "Error interno agregando una desviacin" msgid "The pkg cache must be initialized first" msgstr "El cach del paquete debe de inicializarse primero" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Leyendo Lista de Archivos" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1667,20 +1680,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No pude desmontar el CD-ROM de %s, tal vez todava este en uso." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fichero no encontrado" +msgstr "Disco no encontrado." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1808,7 +1820,7 @@ msgstr "Expir conexin a socket de datos" msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1831,7 +1843,7 @@ msgstr "Fall transferencia de datos, el servidor dijo '%s'" msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "No pude invocar " @@ -1860,75 +1872,78 @@ msgstr "No puedo iniciar la conexin a %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No pude conectarme a %s:%s (%s), expir tiempo para conexin" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "No pude resolver '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo raro pas resolviendo '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "No pude resolver '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Se encontr al menos una firma invlida." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "No se pudo bloquear %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " para verificar la firma (est instalado gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Se instalarn los siguientes paquetes extras:" +msgstr "Las siguientes firms fueron invlidas:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Las firmas siguientes no se pudieron verificar porque su llave pblica no " +"est disponible:\n" #: methods/gzip.cc:57 #, c-format @@ -1940,76 +1955,76 @@ msgstr "No pude abrir una tubera para %s" msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mala lnea de cabecera" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envi una cabecera de respuesta invlida" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envi una cabecera de Content-Length invlida" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envi una cabecera de Content-Range invlida" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "ste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Error interno" @@ -2022,7 +2037,7 @@ msgstr "No puedo hacer mmap de un fichero vaco" msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Seleccin %s no encontrada" @@ -2147,7 +2162,7 @@ msgstr "Operacin invlida: %s" msgid "Unable to stat the mount point %s" msgstr "No se puede obtener informacin del punto de montaje %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@ -2304,62 +2319,62 @@ msgstr "Versiones candidatas" msgid "Dependency generation" msgstr "Generacin de dependencias" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Lnea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" @@ -2413,10 +2428,17 @@ msgstr "Falta el directorio de listas %spartial." msgid "Archive directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Descargando fichero %li de %li (falta %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Leyendo Listado de Archivos" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2429,19 +2451,16 @@ msgid "Method %s did not start correctly" msgstr "El mtodo %s no se inici correctamente" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Cambio de medio: Por favor inserte el disco etiquetado\n" -" '%s'\n" -"en la unidad '%s' y presione Intro\n" +msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no est soportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@ -2567,11 +2586,15 @@ msgstr "Error de E/S guardando cach fuente" msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2581,7 +2604,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2590,7 +2613,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2598,7 +2621,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2703,59 +2726,71 @@ msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Hay problemas abriendo %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Abriendo %s" +msgstr "Desempaquetando %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Abriendo fichero de configuracin %s" +msgstr "Preparndose para configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Conectando a %s" +msgstr "Configurando %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalados: " +msgstr "%s instalado" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Preparndose para eliminar %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Abriendo %s" +msgstr "Eliminando %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomienda" +msgstr "%s eliminado" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparndose para configurar %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "No pude borrar %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" +#~ msgid "Reading file list" +#~ msgstr "Leyendo Lista de Archivos" + +#~ msgid "Could not execute " +#~ msgstr "No se pudo ejecutar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Preparndose para eliminar con su configuracin %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Eliminado con su configuracin %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del fabricante '%s' desconocido en la lnea %u de la lista de\n" @@ -2965,9 +3000,6 @@ msgstr "La conexin se cerr prematuramente" #~ msgid "Failed to rename %s.new to %s" #~ msgstr "No pude renombrar %s.new a %s" -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "Por favor inserte un disco en la unidad y presione Intro" - #~ msgid "I found (binary):" #~ msgstr "Encontr (binario):" @@ -2986,16 +3018,9 @@ msgstr "La conexin se cerr prematuramente" #~ "No pude localizar ningn archivo de paquete, tal vez este no es un disco " #~ "de Debian" -#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -#~ msgstr "" -#~ "Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'" - #~ msgid " '" #~ msgstr " '" -#~ msgid "Repeat this process for the rest of the CDs in your set." -#~ msgstr "Repita este proceso para el resto de los CDs del conjunto." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@ -1,36 +1,35 @@ -# translation of eu.po to librezale.org -# translation of apt_po_eu.po to librezale.org -# translation of apt-eu.po to Basque +# translation of apt_po_eu.po to librezale +# translation of apt_po_eu.po to # This file is put in the public domain. -# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005. -# Piarres Beobide <pi@beobide.net>, 2005. # +# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005. +# Piarres Beobide <pi@beobide.net>, 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: eu\n" +"Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-10-11 20:03+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-05-26 23:18+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" -"Language-Team: librezale.org <librezale@librezale.org>\n" +"Language-Team: librezale <librezale@librezale.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n" +msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "Ezin da %s paketea lokalizatu" +msgstr "Ezin da %s paketea kokatu" #: cmdline/apt-cache.cc:232 msgid "Total package names : " @@ -42,7 +41,7 @@ msgstr " Pakete normalak:" #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr " Pakete birtual puruak:" +msgstr " Pakete birtual hutsak:" #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " @@ -62,7 +61,7 @@ msgstr "Bertsio Ezberdinak Guztira: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "Dependentziak Guztira: " +msgstr "Mendekotasunak Guztira: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " @@ -74,11 +73,11 @@ msgstr "Guztira Saltzaile Mapatzea: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Guztira beteratutakokateak: " +msgstr "Guztira bateratutako kateak: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "Guztira bertsio dependentzi lekua: " +msgstr "Guztira bertsio mendekotasun lekua: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " @@ -86,12 +85,12 @@ msgstr "Guztira galdutako tokia:" #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "Guztira erregitratutako lekua: " +msgstr "Guztira erregistratutako lekua: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "%s pakete-fitxategia ez dago sinkronizatuta." +msgstr "%s pakete fitxategia ez dago sinkronizatuta." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" @@ -103,13 +102,13 @@ msgstr "Ez da paketerik aurkitu" #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "Pakete Fitxatefiak:" +msgstr "Pakete Fitxategiak:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " -"pakete-fitxategi bati" +"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " +"pakete fitxategi bati" #: cmdline/apt-cache.cc:1470 #, c-format @@ -146,21 +145,21 @@ msgstr " Paketearen pin-a:" #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr " Bertsio tabla:" +msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -203,36 +202,48 @@ msgstr "" " apt-cache [aukerak] showpkg pak1 [pak2 ...]\n" " apt-cache [aukerak] showsrc pak1 [pak2 ...]\n" "\n" -"APTren cache-fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n" -"den behe-mailako tresna bat da, apt-cache.\n" +"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n" +"den behe mailako tresna bat da, apt-cache.\n" "Komandoak:\n" -" add - Pakete-fitxategi bat gehitzen du iturburuko cachean\n" -" gencaches - Bi cacheak sortzen ditu: paketeena eta iturburuena\n" +" add - Pakete fitxategi bat gehitzen du iturburuko katxean\n" +" gencaches - Bi katxeak sortzen ditu: paketeena eta iturburuena\n" " showpkg - Pakete baten informazio orokorra erakusten du\n" -" showsrc - Iturburu-erregistroak erakusten ditu\n" +" showsrc - Iturburu erregistroak erakusten ditu\n" " stats - Oinarrizko estatistika batzuk erakusten ditu\n" " dump - Fitxategi osoa erakusten du formatu laburrean\n" " dumpavail - Fitxategi erabilgarri bat irteera estandarrean inprimatu\n" " unmet - Bete gabeko mendekotasunak erakusten ditu\n" -" search - Adierazpen erregularrak bilatzen ditu pakete-zerrendan \n" +" search - Adierazpen erregularrak bilatzen ditu pakete zerrendan \n" " show - Paketearen erregistro irakurgarri bat erakusten du\n" " depends - Pakete baten mendekotasunak erakusten ditu\n" " rdepends - Pakete baten mendekotasun alderantzikatuak erakusten ditu\n" " pkgnames - Pakete guztien izenak zerrendatzen ditu\n" -" dotty - GraphVis-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" -" xvcg - xvcg-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" +" dotty - GraphVis-ekin erabiltzeko pakete grafikoak sortzen ditu\n" +" xvcg - xvcg-ekin erabiltzeko pakete grafikoak sortzen ditu\n" " policy - Gidalerroen ezarpenak erakusten ditu\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -p=? Paketearen cachea.\n" -" -s=? Iturburuaren cachea.\n" -" -q Desgaitu progresio-adierazlea.\n" +" -h Laguntza testu hau.\n" +" -p=? Paketearen katxea.\n" +" -s=? Iturburuaren katxea.\n" +" -q Ezgaitu progresio adierazlea.\n" " -i Mendekotasun nagusiak soilik erakutsi.\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Mesedez idatzi izen bat diskoa honentzat, 'Debian 2.1r1 1 Diskoa' antzerakoa" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Mesedez sar diskoa bat gailuan eta enter sakatu" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parekatu gabeko argumentuak" @@ -254,16 +265,16 @@ msgid "" msgstr "" "Erabilera: apt-config [aukerak] komandoa\n" "\n" -"apt-config APT konfigurazio-fitxategia irakurtzeko tresna soil bat da\n" +"apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n" "\n" "Komandoak:\n" " shell - Shell modua\n" " dump - Konfigurazioa erakusten du\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -h Laguntza testu hau.\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -289,10 +300,10 @@ msgstr "" "informazioa ateratzeko tresna bat da\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" +" -h Laguntza testu hau\n" " -t Ezarri aldi baterako direktorioa\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format @@ -305,7 +316,7 @@ msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Pakete-luzapenen zerrenda luzeegia da" +msgstr "Pakete luzapenen zerrenda luzeegia da" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 @@ -316,11 +327,11 @@ msgstr "Errorea direktorioa prozesatzean %s" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Iturburu-luzapenen zerrenda luzeegia da" +msgstr "Iturburu luzapenen zerrenda luzeegia da" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Errorea eduki-fitxategiaren goiburua idaztean" +msgstr "Errorea eduki fitxategiaren goiburua idaztean" #: ftparchive/apt-ftparchive.cc:401 #, c-format @@ -380,31 +391,31 @@ msgstr "" "estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n" "'dpkg-scanpackages' eta 'dpkg-scansources'erako\n" "Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n" -"Package fitxategiak pakete bakoitzaren kontrol-eremu guztiak izaten ditu,\n" -"MD5 hash balioa eta fitxategi-tamaina barne. Override fitxategia erabiltzen\n" -"da lehentasunearen eta sekzioaren balioak behartzeko.\n" +"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n" +"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n" +"da lehentasunaren eta sekzioaren balioak behartzeko.\n" "\n" -"Era berean, iturburu-fitxategiak ere sortzen ditu .dsc fitxategien\n" +"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n" "zuhaitzetik. --source-override aukera erabil daiteke src override \n" "fitxategi bat zehazteko.\n" "'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n" "BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n" "override fitxategiak override banderak izan behar ditu. Pathprefix \n" -"fitxategi-izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" -"Debian artxiboko erabilera-adibide bat:\n" +"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" +"Debian artxiboko erabilera adibide bat:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" +" -h Laguntza testu hau\n" " --md5 Kontrolatu MD5 sortzea\n" " -s=? Iturburuaren override fitxategia\n" " -q Isilik\n" -" -d=? Hautatu aukerako cachearen datu-basea\n" -" --no-delink Gaitu delink arazketa-modua\n" -" --contents Kontrolatu eduki-fitxategia sortzea\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat" +" -d=? Hautatu aukerako katxearen datubasea\n" +" --no-delink Gaitu delink arazketa modua\n" +" --contents Kontrolatu eduki fitxategia sortzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazioa aukera arbitrario bat" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" @@ -413,31 +424,31 @@ msgstr "Ez dago bat datorren hautapenik" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" +msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" +msgstr "Datubasea hondatua dago; fitxategiari %s.old izena jarri zaio" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" +msgstr "Datubasea zaharra da; %s bertsio berritzen saiatzen ari da" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Ezin da ireki %s datu-base fitxategia: %s" +msgstr "Ezin da ireki %s datubase fitxategia: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Fitxategi-data aldatu egin da: %s" +msgstr "Fitxategi data aldatu egin da: %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Artxiboak ez du kontrol-erregistrorik" +msgstr "Artxiboak ez du kontrol erregistrorik" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -505,21 +516,21 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" #: ftparchive/writer.cc:386 msgid "Archive had no package field" -msgstr "Artxiboak ez du pakete-eremurik" +msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" @@ -561,12 +572,12 @@ msgstr "Huts egin du %s override fitxategia irakurtzean" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "'%s' Kompresio Algoritmo Ezezaguna" +msgstr "'%s' Konpresio Algoritmo Ezezaguna" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "%s irteera konprimituak konpresio-tresna bat behar du" +msgstr "%s irteera konprimituak konpresio tresna bat behar du" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" @@ -582,7 +593,7 @@ msgstr "Huts egin du sardetzean" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "Konprimatu Umeak" +msgstr "Konprimitu Umeak" #: ftparchive/multicompress.cc:238 #, c-format @@ -603,7 +614,7 @@ msgstr "deskonpresorea" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" +msgstr "Huts egin du azpiprozesu/fitxategiko S/I-ak" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" @@ -619,225 +630,225 @@ msgstr "Arazoa %s desestekatzean" msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" -msgstr "Adierazpen erregularren konpilazio-errorea - %s" +msgstr "Adierazpen erregularren konpilazio errorea - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " edo" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" +msgstr "Ondorengo paketeak BERTSIO BERRITUKO dira:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" -"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" +"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " +msgstr "%lu bertsio berritua, %lu berriki instalatuta, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" +msgstr "Ezin da bertsio berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." +msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" -msgstr "Ezin da deskarga-direktorioa blokeatu" +msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "Ezin izan da iturburu-zerrenda irakurri." +msgstr "Ezin izan da iturburu zerrenda irakurri." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -848,28 +859,28 @@ msgstr "" "Jarratzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." -msgstr "Abortatu." +msgstr "Utzi." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -877,47 +888,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" +msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." -msgstr "Abortatu instalazioa." +msgstr "Utzi instalazioa." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, 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" +msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio berritzerik.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -928,75 +939,75 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" -msgstr "Ezin da zerrenda-direktorioa blokeatu" +msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " +"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1004,7 +1015,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1016,7 +1027,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1025,155 +1036,160 @@ msgstr "" "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Berriketak kalkulatzen... " +msgstr "Berritzak kalkulatzen... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" -msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" +msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" +msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" +msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" -msgstr "Eskuratu %s iturubura\n" +msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" +msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" -msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" +msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" +msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" -msgstr "%s: ez du eraikitze-mendekotasunik.\n" +msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " +"%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:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, 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:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." +msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" -msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" +msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1218,37 +1234,37 @@ msgstr "" " apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n" " apt-get [aukerak] source pkg1 [pkg2 ...]\n" "\n" -"apt-get paketeak deskargatu eta instalatzeko komando-lerroko interfaze soil\n" +"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil\n" "bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n" "dira: update eta install.\n" "\n" "Komandoak:\n" -" update - Eskuratu pakete-zerrenda berriak\n" -" upgrade - Egin bertsio-berritzea\n" +" update - Eskuratu pakete zerrenda berriak\n" +" upgrade - Egin bertsio berritzea\n" " install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n" " remove - Kendu paketeak\n" -" source - Deskargatu iturburu-artxiboak\n" -" build-dep - Konfiguratu iturburu-paketeen eraikitze-dependentziak\n" -" dist-upgrade - Banaketaren bertsio-berritzea: ikus apt-get(8)\n" +" source - Deskargatu iturburu artxiboak\n" +" build-dep - Konfiguratu iturburu paketeen eraikitze mendekotasunak\n" +" dist-upgrade - Banaketaren bertsio berritzea: ikus apt-get(8)\n" " dselect-upgrade - Jarraitu dselect hautapenak\n" -" clean - Ezabatu deskargatutako artxibo-fitxategiak\n" -" autoclean - Ezabatu deskargatutako artxibo-fitxategi zaharrak\n" +" clean - Ezabatu deskargatutako artxibo fitxategiak\n" +" autoclean - Ezabatu deskargatutako artxibo fitxategi zaharrak\n" " check - Egiaztatu ez dagoela hautsitako mendekotasunik\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -q Egunkarian erregistratzeko irteera - progresio-adierazlerik gabe\n" +" -h Laguntza testu hau.\n" +" -q Egunkarian erregistratzeko irteera - progresio adierazlerik gabe\n" " -qq Irteerarik ez, erroreentzat izan ezik\n" " -d Deskargatu bakarrik - EZ instalatu edo deskonprimitu artxiboak\n" " -s Ekintzarik ez. Simulazio bat egiten du\n" " -y Galdera guztiei Bai erantzun, galdetu gabe\n" -" -f Saiatu jarraitzen, osotasun-egiaztapenak huts egiten badu\n" -" -m Saiatu jarraitzen, artxiboak ezin badira lokalizatu\n" -" -u Erakutsi bertsio-berritutako paketeen zerrenda ere\n" -" -b Sortu iturburu-paketea lortu ondoren\n" -" -V Erakutsi bertsio-zenbaki xeheak\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n" +" -f Saiatu jarraitzen, osotasun egiaztapenak huts egiten badu\n" +" -m Saiatu jarraitzen, artxiboak ezin badira kokatu\n" +" -u Erakutsi bertsio berritutako paketeen zerrenda ere\n" +" -b Sortu iturburu paketea lortu ondoren\n" +" -V Erakutsi bertsio zenbaki xeheak\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n" "Informazio eta aukera gehiago nahi izanez gero, ikus apt-get(8), \n" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" @@ -1288,11 +1304,11 @@ msgid "" msgstr "" "Medio Aldaketa: Mesedez sar\n" " '%s'\n" -"izeneko diska '%s' gailuan eta enter sakatu\n" +"izeneko diskoa '%s' gailuan eta enter sakatu\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Pakete-erregistro ezezaguna!" +msgstr "Pakete erregistro ezezaguna!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1309,14 +1325,14 @@ msgid "" msgstr "" "Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n" "\n" -"apt-sortpkgs pakete-fitxategiak ordenatzeko tresna soil bat da. Zein\n" +"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n" "motatako fitxategia den adierazteko -s aukera erabiltzen da.\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" -" -s Erabili iturburu-fitxategien ordenatzea\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" +" -h Laguntza testu hau\n" +" -s Erabili iturburu fitxategien ordenatzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" @@ -1363,16 +1379,16 @@ msgstr "Hondatutako artxiboa" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" +msgstr "Tar egiaztapenak huts egin, hondatutako fitxategia" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "%u TAR goiburu-mota ezezaguna, %s kidea" +msgstr "%u TAR goiburu mota ezezaguna, %s kidea" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "Artxibo-sinadura baliogabea" +msgstr "Artxibo sinadura baliogabea" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" @@ -1388,7 +1404,7 @@ msgstr "Artxiboa laburregia da" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Huts egin artxibo-goiburuak irakurtzean" +msgstr "Huts egin artxibo goiburuak irakurtzean" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1396,11 +1412,11 @@ msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Huts egin du hash-elementua lokalizatzean!" +msgstr "Huts egin du hash-elementua kokatzean!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Huts egin du desbideratzea lokalizatzean" +msgstr "Huts egin du desbideratzea kokatzean" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@ -1419,14 +1435,14 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" +msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -1449,7 +1465,7 @@ msgstr "%s direktorioa desbideratuta dago" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketea desbideratze-helburuan %s/%s idazten saiatzen ari da" +msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" @@ -1462,7 +1478,7 @@ msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" +msgstr "Huts egin du nodoa bere hash-ontzian kokatzean" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1471,7 +1487,7 @@ msgstr "Bide-izena luzeegia da" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" +msgstr "Gainidatzi pakete konkordantzia %s(r)en bertsiorik gabe" #: apt-inst/extract.cc:434 #, c-format @@ -1479,7 +1495,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -1506,7 +1523,7 @@ msgstr "Huts egin du %sinfo-tik datuak lortzean" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" +msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 @@ -1518,14 +1535,14 @@ msgstr "Pakete Zerrenda irakurtzen" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean" +msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "Barne errorea pakete Izen bat eskuratzerakoan" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Fitxategi zerrendaketa irakurtzen" @@ -1536,14 +1553,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Huts egin du '%sinfo/%s' zerrenda-fitxategia irekitzean. Fitxategi hori ezin " +"Huts egin du '%sinfo/%s' zerrenda fitxategia irekitzean. Fitxategi hori ezin " "baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen " "bertsio bera!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Huts egin du %sinfo/%s zerrenda-fitxategia irakurtzean" +msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@ -1556,13 +1573,13 @@ msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "Desbideratze-fitxategia hondatuta dago" +msgstr "Desbideratze fitxategia hondatua dago" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Lerro baliogabea desbideratze-fitxategian: %s" +msgstr "Lerro baliogabea desbideratze fitxategian: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" @@ -1570,11 +1587,7 @@ msgstr "Barne errorea desbideratze bat gehitzean" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "Paketearen cachea hasieratu behar da lehendabizi" - -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Fitxategi zerrenda irakurtzen" +msgstr "Paketearen katxea hasieratu behar da lehendabizi" #: apt-inst/deb/dpkgdb.cc:443 #, c-format @@ -1584,7 +1597,7 @@ msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Okerreko ConfFile sekzioa egoera-fitxategian. Desplazamendua %lu" +msgstr "Okerreko ConfFile atala egoera fitxategian. Desplazamendua %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1599,7 +1612,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" +msgstr "Hau ez da baliozko DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1612,7 +1625,7 @@ msgstr "Barne Errorea, ezin da atala kokatu" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu" +msgstr "Ezin izan da baliozko kontrol fitxategi bat kokatu" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" @@ -1621,7 +1634,7 @@ msgstr "Kontrol fitxategi ezin analizagarria" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Ezin da cdrom-eko %s datu-basea irakurri" +msgstr "Ezin da cdrom-eko %s datubasea irakurri" #: methods/cdrom.cc:123 msgid "" @@ -1638,24 +1651,24 @@ msgstr "CD okerra" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da." +msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." #: methods/cdrom.cc:169 msgid "Disk not found." -msgstr "Ez da diska aurkitu" +msgstr "Ez da diskoa aurkitu" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Huts egin du aldaketa-ordua ezartzean" +msgstr "Huts egin du aldaketa ordua ezartzean" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1711,7 +1724,7 @@ msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Konexioaren denbora-muga" +msgstr "Konexioaren denbora muga" #: methods/ftp.cc:335 msgid "Server closed the connection" @@ -1719,7 +1732,7 @@ msgstr "Zerbitzariak konexioa itxi du" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" -msgstr "Irakurketa-errorea" +msgstr "Irakurketa errorea" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." @@ -1727,11 +1740,11 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokolo-hondatzea" +msgstr "Protokolo hondatzea" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" -msgstr "Idazketa-errorea" +msgstr "Idazketa errorea" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1739,7 +1752,7 @@ msgstr "Ezin izan da socket-a sortu" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du" +msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1768,7 +1781,7 @@ msgstr "Ezin da PORT komandoa bidali" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Helbide-familia baliogabea: %u (AF_*)" +msgstr "Helbide familia baliogabea: %u (AF_*)" #: methods/ftp.cc:798 #, c-format @@ -1777,13 +1790,13 @@ msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Datu-socket konexioak denbora-muga gainditu du" +msgstr "Datu-socket konexioak denbora muga gainditu du" #: methods/ftp.cc:825 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1794,19 +1807,19 @@ msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datu-socketak denbora-muga gainditu du" +msgstr "Datu-socketak denbora muga gainditu du" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datu-transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" +msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" msgstr "Kontsulta" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Ezin da deitu " @@ -1833,70 +1846,71 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" +msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Ezin da gako eraztuna eskuratu: '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." +msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "Beintza sinadura baliogabe bat aurkitu da." - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Ezin izan da %s exekutatu" +msgstr "Behintzat sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1914,78 +1928,78 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" +msgstr "Goiburu lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" -msgstr "Okerreko goiburu-lerroa" +msgstr "Okerreko goiburu lerroa" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." +msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" -msgstr "Datu-formatu ezezaguna" +msgstr "Datu formatu ezezaguna" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" -msgstr "Konexioaren denbora-muga gainditu da" +msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" -msgstr "Barne-errorea" +msgstr "Barne errorea" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" @@ -1996,7 +2010,7 @@ msgstr "Ezin da fitxategi huts baten mmap egin" msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" @@ -2004,12 +2018,12 @@ msgstr "%s hautapena ez da aurkitu" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Mota ezezaguneko laburtzapena: '%c'" +msgstr "Mota ezezaguneko laburpena: '%c'" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "%s konfigurazio-fitxategia irekitzen" +msgstr "%s konfigurazio fitxategia irekitzen" #: apt-pkg/contrib/configuration.cc:512 #, c-format @@ -2019,42 +2033,42 @@ msgstr "%d lerroa luzeegia da (gehienez %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik." +msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik." #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Sintasi errorea %s:%u: Gaizki eratutako" +msgstr "Sintaxi errorea %s:%u: Gaizki eratutako" #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren" +msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" +msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" +msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" +msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta" #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" +msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" +msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" #: apt-pkg/contrib/progress.cc:154 #, c-format @@ -2069,18 +2083,18 @@ msgstr "%c%s... Eginda" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Ez da ezagutzen komando-lerroko '%c' aukera [%s]." +msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "Ez da ulertzen komando-lerroko %s aukera" +msgstr "Ez da ulertzen komando lerroko %s aukera" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "Komando-lerroko %s aukera ez da boolearra." +msgstr "Komando lerroko %s aukera ez da boolearra." #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format @@ -2090,7 +2104,7 @@ msgstr "%s aukerak argumentu bat behar du." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du." +msgstr "%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -2115,9 +2129,9 @@ msgstr "Eragiketa baliogabea: %s" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Ezin da atzitu %s muntatze-puntua" +msgstr "Ezin da atzitu %s muntatze puntua" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@ -2129,14 +2143,12 @@ msgstr "Huts egin du CDROMa atzitzean" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "" -"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-" -"fitxategiarentzat" +msgstr "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo fitxategiarentzat" #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "Ezin izan da %s blokeo-fitxategia ireki" +msgstr "Ezin izan da %s blokeo fitxategia ireki" #: apt-pkg/contrib/fileutl.cc:105 #, c-format @@ -2276,62 +2288,62 @@ msgstr "Hautagaien bertsioak" msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete-fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan" +msgstr "'%s' mota ez da ezagutzen %u lerroan %s iturburu-zerrendan" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" @@ -2380,10 +2392,17 @@ msgstr "%spartial zerrenda-direktorioa falta da." msgid "Archive directory %spartial is missing." msgstr "%spartial artxibo-direktorioa falta da." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "%li fitxategia berreskuratzen %li -fitxategitik (%s falta da)" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "%li fitxategia berreskuratzen %li-tik" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2400,12 +2419,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@ -2523,11 +2542,15 @@ msgstr "S/I errorea iturburu-cachea gordetzean" msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2536,7 +2559,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2545,14 +2568,14 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2697,13 +2720,13 @@ msgstr "%s kendurik" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "%s konfigurazioaz ezabatzeko prestatzen" +msgid "Preparing to completely remove %s" +msgstr "%s guztiz ezabatzeko prestatzen" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "%s konfigurazioaz kentzen" +msgid "Completely removed %s" +msgstr "%s guztiz ezabatua" #: methods/rsh.cc:330 msgid "Connection closed prematurely" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -148,14 +148,14 @@ msgstr " Versiotaulukko:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,22 @@ msgstr "" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Taltion vaihto: Pistä levy \n" +"\"%s\"\n" +"asemaan \"%s\" ja paina Enter\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parametrit eivät ole pareittain" @@ -505,7 +521,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" @@ -514,12 +530,12 @@ msgstr "Tiedostolle %s ei toimi stat" msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s: ei poikkeustietuetta\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" @@ -619,79 +635,79 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s" msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " tai" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -700,145 +716,145 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -849,28 +865,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -878,47 +894,47 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -929,49 +945,49 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -979,25 +995,25 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1005,7 +1021,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1016,7 +1032,7 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1026,116 +1042,121 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1143,7 +1164,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1152,32 +1173,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1431,7 +1452,7 @@ msgstr "Asetustiedoston kaksoiskappale %s/%s" msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -1484,7 +1505,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -1530,7 +1552,7 @@ msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut" msgid "Internal error getting a package name" msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Luetaan tiedostoluetteloa" @@ -1577,10 +1599,6 @@ msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" msgid "The pkg cache must be initialized first" msgstr "Pakettivarasto on ensin alustettava" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Luetaan tiedostoluetteloa" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1654,12 +1672,12 @@ msgstr "Tiedostoa ei löydy" msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1787,7 +1805,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1810,7 +1828,7 @@ msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\"" msgid "Query" msgstr "Kysely" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" @@ -1839,71 +1857,71 @@ msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nimeä \"%s\" ei voitu selvittää" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Lukkoa %s ei saada" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1919,76 +1937,76 @@ msgstr "Putkea %s ei voitu avata" msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2001,7 +2019,7 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" @@ -2122,7 +2140,7 @@ msgstr "Virheellinen toiminto %s" msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@ -2279,62 +2297,62 @@ msgstr "Mahdolliset versiot" msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@ -2383,11 +2401,18 @@ msgstr "Luettelokansio %spartial puuttuu." msgid "Archive directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Luetaan tiedostoluetteloa" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2406,12 +2431,12 @@ msgstr "" "\"%s\"\n" "asemaan \"%s\" ja paina Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@ -2531,11 +2556,15 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2544,7 +2573,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2553,7 +2582,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2561,7 +2590,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2709,19 +2738,26 @@ msgid "Removed %s" msgstr "Suosittelut" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Avataan asetustiedosto %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Tiedoston %s poistaminen ei onnistunut" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" +#~ msgid "Reading file list" +#~ msgstr "Luetaan tiedostoluetteloa" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Lukkoa %s ei saada" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s" @@ -1,21 +1,21 @@ # translation of fr.po to French # Advanced Package Transfer - APT message translation catalog # French messages -# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004. -# Christian Perrier <bubulle@debian.org>, 2004-2005. # +# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004. +# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-09-23 08:37+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-05-18 09:31-0500\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.2\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #: cmdline/apt-cache.cc:135 @@ -149,14 +149,14 @@ msgstr " Table de version:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compil le %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -233,6 +233,22 @@ msgstr "" "Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n" "d'informations.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" +"Veuillez rpter cette opration pour tous les disques de votre jeu de " +"cdroms." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Les arguments ne sont pas en parit" @@ -301,7 +317,8 @@ msgstr "Impossible d'crire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" @@ -417,7 +434,8 @@ msgstr "Aucune slection ne correspond" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" #: ftparchive/cachedb.cc:45 #, c-format @@ -509,7 +527,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" @@ -518,12 +536,12 @@ msgstr "Impossible de statuer %s" msgid "Archive had no package field" msgstr "L'archive ne possde pas de champ de paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possde pas d'entre override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" @@ -623,79 +641,79 @@ msgstr "Problme en dliant %s" msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dpendances non satisfaites:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "mais %s est install" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra tre install" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "mais il n'est pas install" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "mais ne sera pas install" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installs:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVS:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont t conservs:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis jour:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis une VERSION INFRIEURE:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changs:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -704,137 +722,139 @@ msgstr "" "Vous NE devez PAS faire ceci, moins de savoir exactement ce\n" "que vous tes en train de faire." -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis jour, %lu nouvellement installs, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu rinstalls, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu remis une version infrieure, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu enlever et %lu non mis jour.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installs ou enlevs.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Correction des dpendances..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " a chou." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dpendances" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis jour" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dpendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION: les paquets suivants n'ont pas t authentifis." -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignor.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Faut-il installer ces paquets sans vrification (o/N)? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu tre authentifis" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problmes et -y a t employ sans --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, InstallPackages appel avec des paquets casss." -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." +msgstr "" +"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a t interrompu." -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rpertoire de tlchargement" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut tre lue." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "trangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel apt@packages.debian.org." -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est ncessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est ncessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "" +"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de dterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a t indique mais il ne s'agit pas d'une opration " @@ -842,11 +862,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -857,28 +877,28 @@ msgstr "" "Pour continuer, tapez la phrase %s\n" "?]" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rcuprer %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Tlchargement achev et dans le mode tlchargement uniquement" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -886,47 +906,48 @@ msgstr "" "Impossible de rcuprer quelques archives, peut-tre devrez-vous lancer apt-" "get update ou essayer avec --fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'change de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, slection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est dj install et la mise jour n'est pas prvue.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas install, et ne peut donc tre supprim\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Install]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement slectionner un paquet installer." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -938,49 +959,50 @@ msgstr "" "devenu obsolte\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "" +"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est dj la plus rcente version disponible.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version %s de %s est introuvable" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version %s de %s n'a pu tre trouve" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -988,25 +1010,26 @@ msgstr "" "Le tlchargement de quelques fichiers d'index a chou, ils ont t " "ignors, ou les anciens ont t utiliss la place." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, slectionne %s pour l'expression rationnelle %s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "" +"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1037,7 @@ msgstr "" "Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1026,7 +1049,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "t crs ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1035,118 +1058,123 @@ msgstr "" "Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider rsoudre la situation: " -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "chec" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de rsolution du problme a cass certaines " "parties" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, 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:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1155,7 +1183,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1164,32 +1192,33 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car aucune version " "du paquet %s ne peut satisfaire la version requise" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "" +"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Modules reconnus:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1362,7 +1391,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1448,7 +1478,7 @@ msgstr "Fichier de configuration en double %s/%s" msgid "Failed to write file %s" msgstr "Erreur d'criture du fichier %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "chec de clture du fichier %s" @@ -1501,7 +1531,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s crase celui inclus dans le paquet %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@ -1549,7 +1580,7 @@ msgstr "Impossible de changer pour le rpertoire d'administration %sinfo" msgid "Internal error getting a package name" msgstr "Erreur interne lors de l'obtention d'un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lecture de la liste de fichiers" @@ -1596,10 +1627,6 @@ msgstr "Erreur interne en ajoutant une dviation" msgid "The pkg cache must be initialized first" msgstr "Le cache des paquets doit tre initialis en premier" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Lecture de la liste des fichiers" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1623,7 +1650,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie %s manquante" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1657,7 +1685,7 @@ msgstr "" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Mauvais CD" +msgstr "Mauvais cdrom" #: methods/cdrom.cc:164 #, c-format @@ -1674,12 +1702,12 @@ msgstr "Disque non trouv." msgid "File not found" msgstr "Fichier non trouv" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1726,7 +1754,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" +msgstr "" +"La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1763,7 +1792,8 @@ msgstr "Impossible de crer un connecteur" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" +msgstr "" +"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1807,7 +1837,7 @@ msgstr "Dlai de connexion au port de donnes dpass" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -1830,7 +1860,7 @@ msgstr "Le transfert de donnes a chou, le serveur a rpondu %s" msgid "Query" msgstr "Requte" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -1859,72 +1889,77 @@ msgstr "Impossible d'initialiser la connexion %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Connexion %s:%s (%s) impossible, dlai de connexion dpass" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Connexion %s:%s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connexion %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Ne parvient pas rsoudre %s" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de rsolution de %s" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" "Quelque chose d'imprvisible est survenu lors de la dtermination de %s:%" "s (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Impossible d'accder au porte-cls:%s" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:191 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +#: methods/gpgv.cc:198 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne: signature correcte, mais il est impossible de dterminer " "l'empreinte de la cl." -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a t rencontre." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Impossible d'excuter " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "pour contrler la signature (veuillez vrifier si gnupg est install)." +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" +"Impossible d'excuter %s pour contrler la signature\n" +"(veuillez vrifier si gnupg est install)." -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue l'excution de gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1942,76 +1977,76 @@ msgstr "Ne parvient pas ouvrir le tube pour %s" msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tte" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tte" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoy un en-tte Content-Length invalide" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoy un en-tte Content-Range invalide" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possde un support des limites non-valide" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Erreur interne" @@ -2024,7 +2059,7 @@ msgstr "Impossible de mapper un fichier vide en mmoire" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de raliser un mapping de %lu octets en mmoire" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "La slection %s n'a pu tre trouve" @@ -2147,7 +2182,7 @@ msgstr "L'opration %s n'est pas valable" msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accder %s" @@ -2304,65 +2339,69 @@ msgstr "Versions possibles" msgid "Dependency generation" msgstr "Gnration des dpendances" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal forme dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal forme dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal forme dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "" +"Le type %s est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2383,7 +2422,8 @@ msgstr "Le type de fichier d'index %s n'est pas accept" #: apt-pkg/algorithms.cc:241 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son " "archive." @@ -2412,11 +2452,18 @@ msgstr "Le rpertoire %spartial pour les listes n'existe pas." msgid "Archive directory %spartial is missing." msgstr "Le rpertoire d'archive %spartial n'existe pas." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "Tlchargement du fichier %li de %li (%s restant)" +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Tlchargement du fichier %li de %li" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2434,12 +2481,12 @@ msgstr "" "Veuillez insrer le disque %s dans le lecteur %s et appuyez sur la " "touche Entre." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le systme de paquet %s n'est pas support" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de dterminer un type du systme de paquets adquat" @@ -2450,7 +2497,8 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "" +"Vous devez insrer quelques adresses sources dans votre sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2524,7 +2572,8 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter." +msgstr "" +"Vous avez dpass le nombre de versions que cet APT est capable de traiter." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." @@ -2560,18 +2609,24 @@ msgstr "Assemblage des fichiers lists dans les champs Provides" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2581,7 +2636,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2590,14 +2645,15 @@ msgstr "" "Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2744,15 +2800,14 @@ msgstr "%s supprim" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "Prparation de la purge de %s" +msgid "Preparing to completely remove %s" +msgstr "Prparation de la suppression complte de %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "%s purg" +msgid "Completely removed %s" +msgstr "%s compltement supprim" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion ferme prmaturment" - @@ -1,34 +1,34 @@ -# translation of apt.po to Galego -# translation of apt.es.po to Galego -# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005. +# Galician translation of apt +# This file is put in the public domain. +# Jacobo Tarrío <jtarrio@debian.org>, 2005. +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-08-03 17:30+0200\n" -"Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" -"Language-Team: Galego\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-05-11 18:09+0200\n" +"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" +"Language-Team: Galician <trasno@ceu.fi.udc.es>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" #: cmdline/apt-cache.cc:135 -#, c-format +#, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "O paquete %s versin %s ten dependencias incumplidas:\n" +msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "Non se puido localizar o paquete %s" +msgstr "Non se puido atopar o paquete %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "Nomes de paquetes totais: " +msgstr "Número total de nomes de paquetes : " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " @@ -40,60 +40,60 @@ msgstr " Paquetes virtuais puros: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Paquetes virtuais nicos: " +msgstr " Paquetes virtuais simples: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " -msgstr " Paquetes virtuais mesturados: " +msgstr " Paquetes virtuais mixtos: " #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr " Faltan: " +msgstr " Non atopados: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "Versins diferentes totais: " +msgstr "Número total de versións distintas: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "Dependencias totais: " +msgstr "Número total de dependencias: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " -msgstr "Relacins versin/ficheiro totais: " +msgstr "Número total de relacións versión/ficheiro: " #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "Mapeo Total de Provisins: " +msgstr "Número total de mapas de Provides: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Cadeas globalizadas totais: " +msgstr "Número total de cadeas: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "Espazo de versin de dependencias total: " +msgstr "Espazo total de versións de dependencias: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Espazo desperdiciado total: " +msgstr "Espazo de reserva total: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "Espazo rexistrado total: " +msgstr "Espazo total contabilizado: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "O ficheiro de paquetes %s non est sincronizado." +msgstr "O ficheiro de paquete %s está sen sincronizar." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Debe dar exactamente un patrn" +msgstr "Debe fornecer exactamente un patrón" #: cmdline/apt-cache.cc:1385 msgid "No packages found" -msgstr "Non se atopou ningn paquete" +msgstr "Non se atopou ningún paquete" #: cmdline/apt-cache.cc:1462 msgid "Package files:" @@ -102,30 +102,31 @@ msgstr "Ficheiros de paquetes:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"Cach fora de sincronismo, non se pode facer x-ref a un ficheiro de paquetes" +"A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " +"paquetes" #: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" -msgstr "%4i %s\n" +msgstr "[%4i] %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "Paquetes con pin:" +msgstr "Paquetes inmobilizados:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "(non atopado)" +msgstr "(non se atopou)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " Instalados: " +msgstr " Instalado: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" -msgstr "(ningn)" +msgstr "(ningún)" #. Candidate Version #: cmdline/apt-cache.cc:1522 @@ -134,26 +135,26 @@ msgstr " Candidato: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr " Pin do paquete: " +msgstr " Inmobilizado: " #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr " Tboa de versin:" +msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -191,45 +192,59 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Uso: apt-cache [opcins] comando\n" -" apt-cache [opcins] add ficheiro1 [ficheiro2 ...]\n" -" apt-cache [opcins] showpkg paq1 [paq2 ...]\n" +"Emprego: apt-cache [opcións] orde\n" +" apt-cache [opcións] add fich1 [fich2 ...]\n" +" apt-cache [opcións] showpkg paq1 [paq2 ...]\n" +" apt-cache [opcións] showsrc paq1 [paq2 ...]\n" "\n" -"apt-cache e unha ferramenta de baixo nivel que se utiliza para manipular\n" -"os ficheiros binarios de cach de APT e consultar informacin sobre estos\n" +"apt-cache é unha ferramenta de baixo nivel que se emprega para manipular\n" +"os ficheiros binarios de caché de APT e obter información deles\n" "\n" -"Comandos:\n" -" add - Agrega un ficheiro de paquete cach fonte\n" -" gencaches - Crea ambas cachs, a de paquetes e a de fontes\n" -" showpkg - Mostra algunha informacin xeral para un s paquete\n" -" showsrc - Mostra a informacin de fonte\n" -" stats - Mostra algunhas estatsticas bsicas\n" -" dump - Mostra o ficheiro enteiro nun formato terso\n" -" dumpavail - Imprime un ficheiro dispoible sada estndar\n" -" unmet - Mostra dependencias incumplidas\n" -" search - Busca na lista de paquetes por un patrn de expresin regular\n" -" show - Mostra un rexistro lexible para o paquete\n" -" depends - Mostra a informacin de dependencias en bruto para o paquete\n" -" rdepends - Mostra a informacin de dependencias inversas do paquete\n" -" pkgnames - Lista os nomes de todos os paquetes\n" -" dotty - Xera grficas do paquete para GraphVis\n" -" xvcg - Xera grficas do paquete para xvcg\n" -" policy - Mostra parmetros das normas\n" +"Ordes:\n" +" add - Engade un ficheiro de paquetes á caché de fontes\n" +" gencaches - Reconstrúe as cachés de paquetes e fontes\n" +" showpkg - Amosa información xeral dun paquete\n" +" showsrc - Amosa os rexistros de fontes\n" +" stats - Amosa algunhas estatísticas básicas\n" +" dump - Amosa todo o ficheiro nun formato abreviado\n" +" dumpavail - Saca un ficheiro de dispoñibles pola saída estándar\n" +" unmet - Amosa as dependencias sen cumprir\n" +" search - Busca unha expresión regular na lista de paquetes\n" +" show - Amosa un rexistro lexible para o paquete\n" +" depends - Amosa a información bruta de dependencias dun paquete\n" +" rdepends - Amosa información de dependencias inversas dun paquete\n" +" pkgnames - Amosa os nomes de tódolos paquetes\n" +" dotty - Xera gráficas de paquetes para GraphVis\n" +" xvcg - Xera gráficas de paquetes para xvcg\n" +" policy - Amosa a configuración de normativa\n" "\n" -"Opcins:\n" +"Opcións:\n" " -h Este texto de axuda.\n" -" -p=? A cach do paquete.\n" -" -s=? A cach da fonte.\n" -" -q Deshabilita o indicador de progreso.\n" -" -i Mostra s dependencias importantes para comando incumplido.\n" -" -c=? Lee este ficheiro de configuracin\n" -" -o=? Establece unha opcin de configuracin arbitraria, ex -o dir::\n" -"cache=/tmp\n" -"Vexa as pxinas do manual apt-cache(8) y apt.conf(5) para mis informacin.\n" +" -p=? A caché de paquetes.\n" +" -s=? A caché de fontes.\n" +" -q Desactiva o indicador de progreso.\n" +" -i Amosa só as dependencias importantes na orde unmet.\n" +" -c=? Le este ficheiro de configuración.\n" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" +"Vexa as páxinas de manual de apt-cache(8) e apt.conf(5) para máis " +"información.\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Forneza un nome para este disco, coma \"Debian 2.1r1 Disco 1\"" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Introduza un disco na unidade e prema Intro" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repita este proceso para o resto de CDs do seu conxunto." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumentos non emparexados" +msgstr "Os argumentos non van en parellas" #: cmdline/apt-config.cc:76 msgid "" @@ -246,24 +261,24 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uso: apt-config [opcins] comando\n" +"Emprego: apt-config [opcións] orde\n" "\n" -"apt-config unha ferramenta para ler o ficheiro de configuracin de APT.\n" +"apt-config é unha ferramenta simple para ler a configuración de APT\n" "\n" -"Comandos:\n" -" shell - Modo shell\n" -" dump - Mostra a configuracin\n" +"Ordes:\n" +" shell - Modo de intérprete de ordes\n" +" dump - Amosa a configuración\n" "\n" -"Opcins:\n" +"Opcións:\n" " -h Este texto de axuda.\n" -" -c=? Lee este ficheiro de configuracin\n" -" -o=? Establece unha opcin de configuracin arbitraria, p. ex. -o dir::\n" -" cache=/tmp\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s non un paquete DEB vlido." +msgstr "%s non é un paquete DEB válido." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -278,17 +293,17 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uso: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" +"Emprego: apt-extracttemplates fich1 [fich2 ...]\n" "\n" -"apt-extracttemplates unha ferramenta para extraer informacin de\n" -"configuracin e modelos de paquetes de debian.\n" +"apt-extracttemplates é unha ferramenta para extraer información\n" +"de configuración e patróns dos paquetes debian\n" "\n" -"Opcins:\n" -" -h Este texto de axuda.\n" -" -t Define o directorio temporal\n" -" -c=? Lee este ficheiro de configuracin\n" -" -o=? Establece unha opcin de configuracin arbitraria, p. ex. -o dir::" -"cache=/tmp\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" -t Estabrece o directorio temporal\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format @@ -297,31 +312,31 @@ msgstr "Non se puido escribir en %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Non se pode atopar a versin de debconf. Est debconf instalado?" +msgstr "Non se puido obter a versión de debconf. ¿Debconf está instalado?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Alista de extensin de paquetes demasiado longa" +msgstr "A lista de extensións de paquetes é longa de máis" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" -msgstr "Erro procesando o directorio %s" +msgstr "Erro ao procesar o directorio %s" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "A lista de extensin de fontes demasiado longa" +msgstr "A lista de extensións de fontes é longa de máis" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Error escribindo cabeceiras de ficheiros de contido" +msgstr "Erro ao gravar a cabeceira no ficheiro de contido" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "Erro procesando contidos %s" +msgstr "Erro ao procesar o contido %s" #: ftparchive/apt-ftparchive.cc:556 msgid "" @@ -364,39 +379,83 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" +"Emprego: apt-ftparchive [opcións] orde\n" +"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n" +" sources rutafontes [fichoverride [prefixoruta]]\n" +" contents ruta\n" +" release ruta\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Soporta\n" +"varios estilos de xeración, de totalmente automática a substitutos " +"funcionais\n" +"de dpkg-scanpackages e dpkg-scansources\n" +"\n" +"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n" +"Packages ten o contido de tódolos campos de control de cada paquete, así\n" +"coma a suma MD5 e o tamaño do ficheiro. Sopórtase un ficheiro de \"overrides" +"\"\n" +"para forzar o valor dos campos Priority e Section.\n" +"\n" +"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n" +".dscs. Pódese empregar a opción --source-override para especificar un " +"ficheiro\n" +"de \"overrides\" para fontes.\n" +"\n" +"As ordes \"packages\" e \"sources\" deberían se executar na raíz da árbore.\n" +"\"Rutabinaria\" debería apuntar á base da busca recursiva e o ficheiro\n" +"\"fichoverride\" debería conter os modificadores de \"override\". " +"\"Prefixoruta\"\n" +"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n" +"de emprego do arquivo de Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" --md5 Controla a xeración de MD5\n" +" -s=? Ficheiro de \"override\" de fontes\n" +" -q Non produce ningunha saída por pantalla\n" +" -d=? Escolle a base de datos de caché opcional\n" +" --no-delink Activa o modo de depuración de desligado\n" +" --contents Controla a xeración do ficheiro de contido\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabrece unha opción de configuración" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Ningunha seleccin coincide" +msgstr "Ningunha selección encaixou" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Faltan algns ficheiros no grupo de ficheiro de paquetes `%s'" +msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\"" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "BD corrompida, ficheiro renomeado a %s.old" +msgstr "" +"A base de datos estaba corrompida, cambiouse o nome do ficheiro a %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB anticuada, tentando actualizar %s" +msgstr "A base de datos é antiga, trátase de actualizar %s" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Non se puido abrir o ficheiro DB %s: %s" +msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Cambiou a data do ficheiro %s" +msgstr "A data do ficheiro cambiou %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Non hai rexistro de control do arquivo" +msgstr "O arquivo non ten un rexistro de control" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -410,7 +469,7 @@ msgstr "A: Non se puido ler o directorio %s\n" #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" -msgstr "A: Non se puido ler %s\n" +msgstr "A: Non se atopou %s\n" #: ftparchive/writer.cc:125 msgid "E: " @@ -422,7 +481,7 @@ msgstr "A: " #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "E: Erros aplicables ao ficheiro " +msgstr "E: Os erros aplícanse ao ficheiro " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format @@ -431,7 +490,7 @@ msgstr "Non se puido resolver %s" #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "Fallou o recorrido pola rbore." +msgstr "O percorrido da árbore fallou" #: ftparchive/writer.cc:188 #, c-format @@ -441,56 +500,56 @@ msgstr "Non se puido abrir %s" #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgstr " DesLig %s [%s]\n" #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "Non se puido ler a ligazn %s" +msgstr "Non se puido ler a ligazón %s" #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "Non se puido desligar %s" +msgstr "Non se puido borrar %s" #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Non puiden ligar %s con %s" +msgstr "*** Non se puido ligar %s con %s" #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink chegou ao lmite de %sB.\n" +msgstr " Alcanzouse o límite de desligado de %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" -msgstr "Non puiden ler %s" +msgstr "Non se atopou %s" #: ftparchive/writer.cc:386 msgid "Archive had no package field" -msgstr "O arquivo non ten campo de paquetes" +msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" -msgstr " %s no ten entrada de predominio\n" +msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " o encargado de %s %s e non %s\n" +msgstr " O mantedor de %s é %s, non %s\n" #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Erro interno, non puiden localizar o membro %s" +msgstr "Erro interno, non se puido atopar o membro %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Non puido reservar memoria" +msgstr "realloc - Non se puido reservar memoria" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -500,48 +559,48 @@ msgstr "Non se puido abrir %s" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Predominio mal formado %s la %lu #1" +msgstr "\"Override\" %s liña %lu mal formado (1)" #: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Predominio mal formado %s la %lu #2" +msgstr "\"Override\" %s liña %lu mal formado (2)" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Predominio mal formado %s la %lu #3" +msgstr "\"Override\" %s liña %lu mal formado (3)" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Non se puido ler o ficheiro de \"overrides\" %s" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo descoecido de compresin '%s'" +msgstr "Algoritmo de compresión \"%s\" descoñecido" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Sada comprimida %s necesita una ferramenta de compresin" +msgstr "A saída comprimida %s precisa dun xogo de compresión" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Fallou a creacin dunha tubera IPC para o subproceso" +msgstr "Non se puido crear a canle IPC ao subproceso" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "No se puido crear FICHEIRO*" +msgstr "Non se puido crear o FILE*" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "Non se puido bifurcar" +msgstr "Non se puido chamar a fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "Fillo de compresin" +msgstr "Fillo de compresión" #: ftparchive/multicompress.cc:238 #, c-format @@ -550,7 +609,7 @@ msgstr "Erro interno, non se puido crear %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Non se puido crear o subproceso IPC" +msgstr "Non se puido crear o IPC do subproceso" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " @@ -558,582 +617,591 @@ msgstr "Non se puido executar o compresor " #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "decompresor" +msgstr "descompresor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Fallou a ES a subproceso/ficheiro" +msgstr "A E/S ao subproceso/ficheiro fallou" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Non se puido ler mentras se computaba MD5" +msgstr "Non se puido ler ao calcular o MD5" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "Hai problemas desligando %s" +msgstr "Problema ao borrar %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Fallou o renome de %s a %s" +msgstr "Non se puido cambiar o nome de %s a %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" -msgstr "Erro de compilacin de expresins regulares - %s" +msgstr "Erro na compilación da expresión regular - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" -msgstr "Os seguintes paquetes teen dependencias incumplidas:" +msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" -msgstr "pero %s est instalado" +msgstr "pero %s está instalado" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" -msgstr "pero %s vai ser instalado" +msgstr "pero hase instalar %s" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" -msgstr "pero non instalable" +msgstr "pero non é instalable" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" -msgstr "pero un paquete virtual" +msgstr "pero é un paquete virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" -msgstr "pero non est instalado" +msgstr "pero non está instalado" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" -msgstr "pero non vai instalarse" +msgstr "pero non se ha instalar" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "Instalaranse os seguintes paquetes NOVOS:" +msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "Os seguintes paquetes ELIMINARANSE:" +msgstr "Os seguintes paquetes hanse ELIMINAR:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "Os seguintes paquetes retivronse:" +msgstr "Os seguintes paquetes consérvanse:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "Actualizaranse os seguintes paquetes:" +msgstr "Os seguintes paquetes hanse actualizar:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "DESACTUALIZARANSE os seguintes paquetes:" +msgstr "Os seguintes paquetes hanse DESACTUALIZAR:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "Cambiaranse os seguintes paquetes retidos:" +msgstr "Os seguintes paquetes retidos hanse modificar:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " -msgstr "%s (por %s) " +msgstr "%s (debido a %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" +"AVISO: Hanse eliminar os seguintes paquetes esenciais.\n" +"¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu actualizados, %lu instalaranse, " +msgstr "%lu actualizados, %lu instalados, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu para eliminar e %lu non actualizados.\n" +msgstr "%lu hanse eliminar e %lu sen actualizar.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu non instalados de todo ou eliminados.\n" +msgstr "%lu non instalados ou eliminados de todo.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." -msgstr "Correxindo dependencias..." +msgstr "A corrixir as dependencias..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" -msgstr "Non se pode correxir as dependencias" +msgstr "Non se puido corrixir as dependencias." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "Non se puido minimizar o conxunto de actualizacin" +msgstr "Non se puido minimizar o xogo de actualizacións" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" -msgstr " Listo" +msgstr " Rematado" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Tal vez queira executar `apt-get -f install' para correxilo." +msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." -msgstr "Dependencias incumplidas. Probe de novo usando -f." +msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISO: Non se puideron autenticar os seguintes paquetes!" +msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "Instalar estos paquetes sen verificacin [s/N]? " +msgstr "¿Instalar estes paquetes sen verificación [s/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "Algns paquetes non se poden autenticar" +msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" -msgstr "Hai problemas e utilizouse -y sen --force-yes" +msgstr "Houbo problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos." -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "Os paquetes necesitan eliminarse pero Remove est deshabilitado." +msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Erro interno, non se puido crear %s" +msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" -msgstr "Non se puido bloquear o directorio de descarga" +msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "Non se puideron ler as listas de fontes." +msgstr "Non se puido ler a lista de orixes." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Necestase descargar %sB/%sB de arquivos.\n" +msgstr "Hai que recibir %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Necesito descargar %sB de arquivos.\n" +msgstr "Hai que recibir %sB de arquivos.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" -"Utilizaranse %sB de espacio de disco adicional despois de desempaquetar.\n" +msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Liberaranse %sB despois de desempaquetar.\n" +msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Non ten suficiente espazo libre en %s" +msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "Non ten suficiente espazo libre en %s." +msgstr "Non hai espazo libre de abondo en %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Especificouse Trivial Only pero sta non unha operacin trivial." +msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" -msgstr "S, faga o que lle digo!" +msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" +"Está a piques de facer algo perigoso.\n" +"Para continuar escriba a frase \"%s\"\n" +" ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." -msgstr "Abortado." +msgstr "Abortar." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " -msgstr "Desexa continuar [S/n]? " +msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Imposible obter %s %s\n" +msgstr "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" -msgstr "Algns ficheiros non puideron descargarse" +msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" -msgstr "Descarga completa e en modo de s descarga" +msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Non se puideron obter algns arquivos, quizais deba executar\n" -"apt-get update ou deba intentalo de novo con --fix-missing?" +"Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" +"missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "Actualmente non estn soportados --fix-missing e intercambio de medio" +msgstr "" +"O emprego conxunto de --fix-missing e intercambio de discos non está " +"soportado" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." -msgstr "Non se puideron correxir os paquetes que faltan." +msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." -msgstr "Abortando a instalacin." +msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota, seleccionando %s no lugar de %s\n" +msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Ignorando %s, xa est instalado e a actualizacin non est activada.\n" +msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "O paquete %s non est instalado, non se eliminar\n" +msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "O paquete %s un paquete virtual provisto por:\n" +msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Necesita seleccionar explicitamente un para instalar." +msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"O paquete %s non est dispoible, pero algn outro paquete fai referencia\n" -"a el. Isto pode significar que o paquete falta, est obsoleto ou s se\n" -"atopa dispoible desde algunha outra fonte\n" +"O paquete %s non está dispoñible, pero outro paquete fai referencia a el.\n" +"Isto pode significar que o paquete falla, está obsoleto ou só está\n" +"dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "Nembargantes, os seguintes paquetes o reemprazan:" +msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "O paquete %s non ten candidato para sa instalacin" +msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Non posible reinstalar o paquete %s, non se pode descargar.\n" +msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s xa est na sa versin mis recente.\n" +msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Non se atopou a Distribucin '%s' para '%s'" +msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Non se atopou a versin '%s' para '%s'" +msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Versin seleccionada %s (%s) para %s\n" +msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" -msgstr "O comando de actualizacin non toma argumentos" +msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Algns ficheiros de ndice non se puideron descargar, hanse ignorar,\n" -"ou hanse empregar uns antigos no su lugar." +"Non se puido descargar algúns ficheiros de índices; ignoráronse ou " +"empregáronse uns vellos no seu lugar." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Erro Interno, AllUpgrade rompeu cousas" +msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Nota, seleccionando %s para a expresin regular '%s'\n" +msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Tal vez queira executar `apt-get -f install' para correxilo:" +msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependencias incumplidas. Intente 'apt-get -f install' sen paquetes (ou " -"especifique unha solucin)." +"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " +"especifique unha solución)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Non se puideron instalar algns paquetes. Isto pode significar que\n" -"vostede pediu unha situacin imposible ou, se est usando a distribucin\n" -"inestable, que algns paquetes necesarios non foron creados ou foron\n" -"movidos fora de Incoming." +"Non se puido instalar algúns paquetes. Isto pode significar que solicitou\n" +"unha situación imposible ou, se emprega a distribución inestable, que\n" +"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Como s solicitou unha nica operacin, extremadamente posible que o\n" -"paquete simplemente non sexa instalable e debera de encher un informe de\n" -"erro contra ese paquete." +"Xa que só solicitou unha soa operación, é bastante probable que o\n" +"paquete non sea instalable e que se deba informar dun erro no paquete." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "A seguinte informacin pode axudar a resolver a situacin:" +msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "Instalaranse os seguintes paquetes extras:" +msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" -msgstr "Paquetes suxeridos:" +msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" -msgstr "Paquetes recomendados" +msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Calculando a actualizacin... " +msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" -msgstr "Listo" +msgstr "Rematado" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Erro Interno, AllUpgrade rompeu cousas" +msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" -msgstr "Debe especificar ao menos un paquete para obter seu cdigo fonte" +msgstr "" +"Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" -msgstr "Non se puido atopar un paquete de fontes para %s" +msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Omítese o ficheiro xa descargado \"%s\"\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" -msgstr "Non ten suficiente espazo libre en %s" +msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Necesito descargar %sB/%sB de arquivos fonte.\n" +msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Necesito descargar %sB de arquivos fonte.\n" +msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" -msgstr "Fonte obtida %s\n" +msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." -msgstr "Non se puideron obter algns arquivos." +msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Ignorando desempaquetamento de paquetes xa desempaquetados en %s\n" +msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Fallou o comando de desempaquetamento '%s'.\n" +msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Fallou o comando de construccin '%s'.\n" +msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" -msgstr "Fallou o proceso fillo" +msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Debe especificar ao menos un paquete para verificar sas\n" -"dependencias de construccin" +"Ten que especificar alomenos un paquete para lle comprobar as dependencias " +"de compilación" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Non se puido obter informacin de dependencias de construccin para %s" +msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" -msgstr "%s non ten dependencias de construccin.\n" +msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"A dependencia %s en %s non pode satisfacerse porque non se pode \n" -"atopar o paquete %s" +"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " +"o paquete %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"A dependencia %s en %s non pode satisfacerse porque ningunha versin\n" -"dispoible do paquete %s satisfai os requisitos de versin" +"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " +"dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Non se puido satisfacer a dependencia %s para %s: O paquete instalado %s " -"demasiado novo" +"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " +"novo de máis" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Non se puido satisfacer a dependencia %s para %s: %s" +msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "No se puideron satisfacer as dependencias de construccin de %s." +msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" -msgstr "Non se puideron procesar as dependencias de construccin" +msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" -msgstr "Mdulos soportados:" +msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1174,53 +1242,54 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Uso: apt-get [opcins] comando\n" -" apt-get [opcins] install|remove paq1 [paq2 ...]\n" -" apt-get [opcins] source paq1 [paq2 ...]\n" +"Emprego: apt-get [opcións] orde\n" +" apt-get [opcións] install|remove paq1 [paq2 ...]\n" +" apt-get [opcións] source paq1 [paq2 ...]\n" "\n" -"apt-get unha sinxela interface de la de comandos para descargar e\n" -"instalar paquetes. Os comandos mis empregados son update e install.\n" +"apt-get é unha simple interface de liña de ordes para descargar e instalar\n" +"paquetes. As ordes empregadas máis habitualmente son \"update\" e \"install" +"\".\n" "\n" -"Comandos:\n" -" update - Descarga novas listas de paquetes\n" -" upgrade - Realiza unha actualizacin\n" -" install - Instala novos paquetes (paquete libc6 e non libc6.deb)\n" +"Ordes:\n" +" update - Descarga as novas listas de paquetes\n" +" upgrade - Realiza unha actualización\n" +" install - Instala novos paquetes (o paquete chámase libc6, non libc6." +"deb)\n" " remove - Elimina paquetes\n" -" source - Descarga arquivos fuente\n" -" build-dep - Configura as dependencias de construccin para paquetes " -"fonte\n" -" dist-upgrade - Actualiza a distribucin, vexa apt-get(8)\n" -" dselect-upgrade - Segue as seleccins de dselect\n" -" clean - Elimina os arquivos descargados\n" -" autoclean - Elimina os arquivos descargados antigos\n" -" check - Verifica que non haxa dependencias incumplidas\n" +" source - Descarga arquivos de código fonte\n" +" build-dep - Configura as dependencias de compilación dos paquetes fonte\n" +" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n" +" dselect-upgrade - Sigue as seleccións de dselect\n" +" clean - Borra os arquivos descargados\n" +" autoclean - Borra os arquivos antigos descargados\n" +" check - Verifica que non hai dependencias rotas\n" "\n" -"Opcins:\n" +"Opcións:\n" " -h Este texto de axuda.\n" -" -q Sada rexistrable - sen indicador de progreso\n" -" -qq Sen sada, excepto se hai erros\n" -" -d S descarga - NON instala ou desempaqueta os arquivos\n" -" -s Non acta. Realiza unha simulacin\n" -" -y Asume S para todas as consultas\n" -" -f Intenta continuar se a comprobacin de integridade faia\n" -" -m Intenta continuar se os arquivos non son localizables\n" -" -u Mostra tamn unha lista de paquetes actualizados\n" -" -b Constre o paquete fonte despois de obtelo\n" -" -V Mosta nmeros de versin detallados\n" -" -c=? Lee este ficheiro de configuracin\n" -" -o=? Establece unha opcin de configuracin arbitraria, p. ex. \n" -" -o dir::cache=/tmp\n" -"Consulte as pxinas do manual de apt-get(8), sources.list(5) e apt.conf(5)\n" -"para mis informacin e opcins.\n" -" Este APT ten poderes de Super Vaca.\n" +" -q Saída que se pode rexistrar - sen indicador de progreso\n" +" -qq Sen saída agás os erros\n" +" -d Só descarga - NON instala nin desempaqueta os arquivos\n" +" -s No-act. Realiza unha simulación de ordeamento\n" +" -y Supón \"Sí\" a tódalas preguntas e non as amosa\n" +" -f Tenta continuar se a comprobación de integridade falla\n" +" -m Tenta continuar se non se poden localizar os arquivos\n" +" -u Tamén amosa unha lista de paquetes actualizados\n" +" -b Constrúe o paquete fonte despois de o descargar\n" +" -V Amosa números detallados de versión\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" +"Vexa as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) para\n" +"ver máis información e opcións.\n" +" Este APT ten Poderes de Super Vaca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "Obx " +msgstr "Teño " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Des:" +msgstr "Rcb:" #: cmdline/acqprogress.cc:110 msgid "Ign " @@ -1233,12 +1302,12 @@ msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Descargados %sB en %s (%sB/s)\n" +msgstr "Recibíronse %sB en %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Traballando]" +msgstr " [A traballar]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1247,13 +1316,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Troco de medio: Por favor insire o disco etiquetado\n" -" '%s'\n" -"na unidade '%s' e prema Intro\n" +"Cambio de soporte: introduza o disco etiquetado\n" +" \"%s\"\n" +"na unidade \"%s\" e prema Intro\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Rexistro de paquete descoecido!" +msgstr "¡Rexistro de paquete descoñecido!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1268,21 +1337,21 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uso: apt-sortpkgs [opcins] ficheiro1 [ficheiro2 ...]\n" +"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n" "\n" -"apt-sortpkgs unha ferramenta sinxela para ordenar ficheiros de paquetes.\n" -"A opcin -s utilzase para indicar qu tipo de ficheiro .\n" +"apt-sortpkgs é unha ferramenta simple para ordear ficheiros de paquetes.\n" +"A opción -s emprégase para indicar o tipo de ficheiro que é.\n" "\n" -"Opcins:\n" -" -h Este texto de axuda.\n" -" -s Emprega ordenamiento de ficheiros fuente\n" -" -c=? Lee este ficheiro de configuracin\n" -" -o=? Establece unha opcin de configuracin arbitraria, p. ex. -o dir::\n" -"cache=/tmp\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" -s Emprega ordeamento por ficheiros fonte\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabrece unha opción de configuración; por exemplo, -o dir::cache=/" +"tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Parmetro por omisin incorrecto!" +msgstr "¡Configuración por defecto incorrecta!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 @@ -1291,217 +1360,207 @@ msgstr "Prema Intro para continuar." #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Ocorreron algns erros mentras se desempaquetaba. Vase a configurar o" +msgstr "Houbo algúns erros ao desempaquetar. Vanse configurar os paquetes" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "paquetes que foron instalados. Isto pode dar lugar a erros duplicados" +msgstr "que se instalaron. Isto pode producir erros duplicados ou erros" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"ou erros causados por dependencias non presentes. Isto est BEN, s os\n" -"erros" +msgstr "causados por dependencias incumpridas. Isto é normal, só os erros" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"encima desta mensaxe son importantes. Por favor corrxaas e execute\n" -"[I]nstall outra vez" +"que hai enriba desta mensaxe son importantes. Arránxeos e volva instalar." #: dselect/update:30 msgid "Merging available information" -msgstr "Fusionando informacin dispoible" +msgstr "A mesturar a información sobre paquetes dispoñibles" #: apt-inst/contrib/extracttar.cc:117 -#, fuzzy msgid "Failed to create pipes" -msgstr "No se puido crear FICHEIRO*" +msgstr "Non se puido crear as canles" #: apt-inst/contrib/extracttar.cc:143 -#, fuzzy msgid "Failed to exec gzip " -msgstr "Non se puido executar o compresor " +msgstr "Non se puido executar gzip" #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" -msgstr "" +msgstr "Arquivo corrompido" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "" +msgstr "A suma de comprobación do arquivo tar non coincide, está corrompido" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "" +msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "" +msgstr "Sinatura de arquivo non válida" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "" +msgstr "Erro ao ler a cabeceira do membro do arquivo" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "" +msgstr "Cabeceira do membro do arquivo non válida" #: apt-inst/contrib/arfile.cc:131 -#, fuzzy msgid "Archive is too short" -msgstr "Non hai rexistro de control do arquivo" +msgstr "O arquivo é curto de máis" #: apt-inst/contrib/arfile.cc:135 -#, fuzzy msgid "Failed to read the archive headers" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Non se puido ler as cabeceiras dos arquivos" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "" +msgstr "Chamouse a DropNode nun nodo aínda ligado" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "" +msgstr "Non se puido atopar o elemento hash" #: apt-inst/filelist.cc:463 -#, fuzzy msgid "Failed to allocate diversion" -msgstr "realloc - Non puido reservar memoria" +msgstr "Non se puido reservar un desvío" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "" +msgstr "Erro interno en AddDiversion" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "" +msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "" +msgstr "Desvío %s -> %s engadido dúas veces" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "" +msgstr "Ficheiro de configuración %s/%s duplicado" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Non se puido resolver %s" +msgstr "Non se puido gravar o ficheiro %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 -#, fuzzy, c-format +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#, c-format msgid "Failed to close file %s" -msgstr "Non se puido abrir %s" +msgstr "Non se puido pechar o ficheiro %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 -#, fuzzy, c-format +#, c-format msgid "The path %s is too long" -msgstr "A lista de extensin de fontes demasiado longa" +msgstr "A ruta %s é longa de máis" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "" +msgstr "A desempaquetar %s máis dunha vez" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "" +msgstr "O directorio %s está desviado" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "" +msgstr "O paquete tenta gravar no destino do desvío %s/%s" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 -#, fuzzy msgid "The diversion path is too long" -msgstr "A lista de extensin de fontes demasiado longa" +msgstr "A ruta do desvío é longa de máis" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "" +msgstr "O directorio %s estase a substituír por algo que non é un directorio" #: apt-inst/extract.cc:283 -#, fuzzy msgid "Failed to locate node in its hash bucket" -msgstr "Fallou a creacin dunha tubera IPC para o subproceso" +msgstr "Non se puido atopar o nodo no seu caldeiro hash" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "" +msgstr "A ruta é longa de máis" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "" +msgstr "Coincidencia na sobrescritura sen versión para %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "" +msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 -#, fuzzy, c-format +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#, c-format msgid "Unable to read %s" -msgstr "Non se puido abrir %s" +msgstr "Non se pode ler %s" #: apt-inst/extract.cc:494 -#, fuzzy, c-format +#, c-format msgid "Unable to stat %s" -msgstr "A: Non se puido ler %s\n" +msgstr "Non se atopou %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 -#, fuzzy, c-format +#, c-format msgid "Failed to remove %s" -msgstr "Non se puido resolver %s" +msgstr "Non se puido eliminar %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 -#, fuzzy, c-format +#, c-format msgid "Unable to create %s" -msgstr "Non se puido escribir en %s" +msgstr "Non se pode crear %s" #: apt-inst/deb/dpkgdb.cc:118 -#, fuzzy, c-format +#, c-format msgid "Failed to stat %sinfo" -msgstr "Non puiden ler %s" +msgstr "Non se atopou %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" msgstr "" +"Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 -#, fuzzy msgid "Reading package lists" -msgstr "Paquetes rotos" +msgstr "A ler as listas de paquetes" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "" +msgstr "Non se puido cambiar ao directorio de administración %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -#, fuzzy msgid "Internal error getting a package name" -msgstr "Erro interno, non se puido crear %s" +msgstr "Erro interno ao obter un nome de paquete" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" -msgstr "" +msgstr "A ler a lista de ficheiros" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1510,819 +1569,805 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" +"Non se puido abrir o ficheiro de listas \"%sinfo/%s\". Se non pode " +"recuperalo, baléireo e reinstale a mesma versión do paquete." #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 -#, fuzzy, c-format +#, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Non se puido ler o ficheiro de listas %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 -#, fuzzy msgid "Internal error getting a node" -msgstr "Erro interno, non se puido crear %s" +msgstr "Erro interno ao obter un nodo" #: apt-inst/deb/dpkgdb.cc:309 -#, fuzzy, c-format +#, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Non se puido abrir o ficheiro de desvíos %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "" +msgstr "O ficheiro de desvíos está corrompido" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 -#, fuzzy, c-format +#, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Liña non válida no ficheiro de desvíos: %s" #: apt-inst/deb/dpkgdb.cc:362 -#, fuzzy msgid "Internal error adding a diversion" -msgstr "Erro interno, non se puido crear %s" +msgstr "Erro interno ao engadir un desvío" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" +msgstr "Ten que se inicializar a caché de paquetes primeiro" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "" +msgstr "Non se puido atopar unha cabeceira Package:, desprazamento %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "" +msgstr "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "" +msgstr "Erro ao analizar o MD5. Desprazamento %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" +msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\"" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "" +msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\"" #: apt-inst/deb/debfile.cc:112 -#, fuzzy, c-format +#, c-format msgid "Couldn't change to %s" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se puido cambiar a %s" #: apt-inst/deb/debfile.cc:138 -#, fuzzy msgid "Internal error, could not locate member" -msgstr "Erro interno, non puiden localizar o membro %s" +msgstr "Erro interno, non se puido atopar un membro" #: apt-inst/deb/debfile.cc:171 -#, fuzzy msgid "Failed to locate a valid control file" -msgstr "Non se puido ler o ficheiro de predominio %s" +msgstr "Non se puido atopar un ficheiro de control válido" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "" +msgstr "Ficheiro de control non analizable" #: methods/cdrom.cc:114 -#, fuzzy, c-format +#, c-format msgid "Unable to read the cdrom database %s" -msgstr "Non se puido localizar o paquete %s" +msgstr "Non se puido ler a base de datos de CD-ROMs %s" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" +"Empregue apt-cdrom para que APT poida recoñecer este CD-ROM. Non se pode " +"empregar apt-get update para engadir CD-ROMs" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "" +msgstr "CD-ROM incorrecto" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" +msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "(non atopado)" +msgstr "Non se atopou o disco" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 -#, fuzzy msgid "File not found" -msgstr "(non atopado)" +msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 -#, fuzzy msgid "Failed to stat" -msgstr "Non puiden ler %s" +msgstr "Non se atopou" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 -#, fuzzy +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Non puiden ler %s" +msgstr "Non se puido estabrecer a hora de modificación" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "" +msgstr "URI non válido, os URIs locais non deben comezar por //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "" +msgstr "A se identificar" #: methods/ftp.cc:168 -#, fuzzy msgid "Unable to determine the peer name" -msgstr "Non se puido minimizar o conxunto de actualizacin" +msgstr "Non se puido determinar o nome do outro extremo" #: methods/ftp.cc:173 -#, fuzzy msgid "Unable to determine the local name" -msgstr "Non se puido minimizar o conxunto de actualizacin" +msgstr "Non se puido determinar o nome local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "" +msgstr "O servidor rexeitou a conexión e dixo: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "" +msgstr "A orde USER fallou, o servidor dixo: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "" +msgstr "A orde PASS fallou, o servidor dixo: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" +"Especificouse un servidor proxy pero non un script de conexión, Acquire::" +"ftp::ProxyLogin está baleiro." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "" +msgstr "A orde do script de conexión \"%s\" fallou, o servidor dixo: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "" +msgstr "A orde TYPE fallou, o servidor dixo: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "" +msgstr "Tempo esgotado para a conexión" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "" +msgstr "O servidor pechou a conexión" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" -msgstr "" +msgstr "Erro de lectura" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "" +msgstr "Unha resposta desbordou o buffer." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "" +msgstr "Corrupción do protocolo" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" -msgstr "" +msgstr "Erro de escritura" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "" +msgstr "Non se puido crear un socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" +"Non se puido conectar o socket de datos, o tempo esgotouse para a conexión" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "" +msgstr "Non se puido conectar o socket pasivo." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "" +msgstr "getaddrinfo non puido obter un socket para escoitar" #: methods/ftp.cc:736 -#, fuzzy msgid "Could not bind a socket" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se puido ligar un socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "" +msgstr "Non se puido escoitar no socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "" +msgstr "Non se puido determinar o nome do socket" #: methods/ftp.cc:779 -#, fuzzy msgid "Unable to send PORT command" -msgstr "Non se puido obter un cursor" +msgstr "Non se puido enviar a orde PORT" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "" +msgstr "Familia de enderezos %u (AF_*) descoñecida" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "" +msgstr "A orde EPRT fallou, o servidor dixo: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "" +msgstr "A conexión do socket de datos esgotou o tempo" #: methods/ftp.cc:825 -#, fuzzy msgid "Unable to accept connection" -msgstr "Non se pode correxir as dependencias" +msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 -#, fuzzy +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Fallou o recorrido pola rbore." +msgstr "Problema ao calcular o hash do ficheiro" #: methods/ftp.cc:877 -#, fuzzy, c-format +#, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Non se puido abrir o ficheiro DB %s: %s" +msgstr "Non se pode obter o ficheiro, o servidor dixo \"%s\"" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "" +msgstr "O socket de datos esgotou o tempo" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "" +msgstr "A transferencia de datos fallou, o servidor dixo \"%s\"" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "" +msgstr "Petición" -#: methods/ftp.cc:1106 -#, fuzzy +#: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "Non se puido abrir %s" +msgstr "Non se puido chamar a " #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "" +msgstr "A conectar a %s (%s)" #: methods/connect.cc:71 #, c-format msgid "[IP: %s %s]" -msgstr "" +msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "" +msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "" +msgstr "Non se pode iniciar a conexión a %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "" +msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "" +msgstr "Non se puido conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "" +msgstr "A conectar a %s" -#: methods/connect.cc:165 -#, fuzzy, c-format +#: methods/connect.cc:167 +#, c-format msgid "Could not resolve '%s'" -msgstr "Non se puido resolver %s" +msgstr "Non se puido resolver \"%s\"" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "" +msgstr "Fallo temporal ao resolver \"%s\"" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "" +msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" -#: methods/connect.cc:221 -#, fuzzy, c-format +#: methods/connect.cc:223 +#, c-format msgid "Unable to connect to %s %s:" -msgstr "Non se puido escribir en %s" +msgstr "Non se pode conectar a %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Non se puido acceder ao chaveiro: \"%s\"" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Erro interno: Sinatura correcta, pero non se puido determinar a pegada " +"dixital da chave" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Atopouse alomenos unha sinatura non válida." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Non se puido atopar o paquete %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg " +"instalado?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Instalaranse os seguintes paquetes extras:" +msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Non se puido verificar as seguintes sinaturas porque a chave pública non " +"está dispoñible:\n" #: methods/gzip.cc:57 -#, fuzzy, c-format +#, c-format msgid "Couldn't open pipe for %s" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se puido abrir unha canle para %s" #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" -msgstr "" +msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" -msgstr "" +msgstr "A agardar polas cabeceiras" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "" +msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" -msgstr "" +msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "" +msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" +msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" +msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" -msgstr "" +msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:594 -#, fuzzy +#: methods/http.cc:626 msgid "Unknown date format" -msgstr "Rexistro de paquete descoecido!" +msgstr "Formato de data descoñecido" -#: methods/http.cc:741 -#, fuzzy +#: methods/http.cc:773 msgid "Select failed" -msgstr " fallou." +msgstr "Fallou a chamada a select" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" -msgstr "" +msgstr "A conexión esgotou o tempo" -#: methods/http.cc:769 -#, fuzzy +#: methods/http.cc:801 msgid "Error writing to output file" -msgstr "Error escribindo cabeceiras de ficheiros de contido" +msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:797 -#, fuzzy +#: methods/http.cc:832 msgid "Error writing to file" -msgstr "Error escribindo cabeceiras de ficheiros de contido" +msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:822 -#, fuzzy +#: methods/http.cc:860 msgid "Error writing to the file" -msgstr "Error escribindo cabeceiras de ficheiros de contido" +msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" -msgstr "" +msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" -msgstr "" +msgstr "Erro ao ler do servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" -msgstr "" +msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" -msgstr "" +msgstr "A conexión fallou" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" -msgstr "" +msgstr "Erro interno" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "" +msgstr "Non se pode facer mmap sobre un ficheiro baleiro" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "" +msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" -msgstr "" +msgstr "Non se atopou a selección %s" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "" +msgstr "Abreviatura de tipo \"%c\" descoñecida" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "" +msgstr "A abrir o ficheiro de configuración %s" #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" -msgstr "" +msgstr "Liña %d longa de máis (máximo %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" +msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Incluído de aquí" #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" #: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Error!" -msgstr "" +msgstr "%c%s... ¡Erro!" #: apt-pkg/contrib/progress.cc:156 #, c-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Rematado" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "" +msgstr "Non se coñece a opción de liña de ordes \"%c\" [de %s]." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "" +msgstr "Non se entende a opción de liña de ordes %s" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "" +msgstr "A opción de liña de ordes %s non é booleana" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "" +msgstr "A opción %s precisa dun argumento." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" +"Opción %s: A especificación de elemento de configuración debe ter un =<val>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "" +msgstr "A opción %s precisa dun argumento enteiro, non \"%s\"" #: apt-pkg/contrib/cmndline.cc:268 -#, fuzzy, c-format +#, c-format msgid "Option '%s' is too long" -msgstr "A lista de extensin de fontes demasiado longa" +msgstr "A opción \"%s\" é longa de máis" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "" +msgstr "O senso %s non se entende, probe \"true\" ou \"false\"." #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr "" +msgstr "Operación %s non válida" #: apt-pkg/contrib/cdromutl.cc:55 -#, fuzzy, c-format +#, c-format msgid "Unable to stat the mount point %s" -msgstr "Non se puido escribir en %s" +msgstr "Non se pode analizar o punto de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 -#, fuzzy, c-format +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#, c-format msgid "Unable to change to %s" -msgstr "Non se puido escribir en %s" +msgstr "Non se pode cambiar a %s" #: apt-pkg/contrib/cdromutl.cc:190 -#, fuzzy msgid "Failed to stat the cdrom" -msgstr "Non puiden ler %s" +msgstr "Non se puido analizar o CD-ROM" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "" +msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" #: apt-pkg/contrib/fileutl.cc:87 -#, fuzzy, c-format +#, c-format msgid "Could not open lock file %s" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se puido abrir o ficheiro de bloqueo %s" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "" +msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" #: apt-pkg/contrib/fileutl.cc:109 -#, fuzzy, c-format +#, c-format msgid "Could not get lock %s" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se puido obter o bloqueo %s" #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "" +msgstr "Agardouse por %s pero non estaba alí" #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "" +msgstr "O subproceso %s recibiu un fallo de segmento." #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "" +msgstr "O subproceso %s devolveu un código de erro (%u)" #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "" +msgstr "O subproceso %s saíu de xeito inesperado" #: apt-pkg/contrib/fileutl.cc:436 -#, fuzzy, c-format +#, c-format msgid "Could not open file %s" -msgstr "Non se puido abrir o ficheiro DB %s: %s" +msgstr "Non se puido abrir o ficheiro %s" #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" -msgstr "" +msgstr "lectura, aínda hai %lu para ler pero non queda ningún" #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "" +msgstr "escritura, aínda hai %lu para escribir pero non se puido" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "" +msgstr "Problema ao pechar o ficheiro" #: apt-pkg/contrib/fileutl.cc:603 -#, fuzzy msgid "Problem unlinking the file" -msgstr "Hai problemas desligando %s" +msgstr "Problema ao borrar o ficheiro" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "" +msgstr "Problema ao sincronizar o ficheiro" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" -msgstr "" +msgstr "Caché de paquetes baleira" #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "" +msgstr "O ficheiro de caché de paquetes está corrompido" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "" +msgstr "O ficheiro de caché de paquetes é unha versión incompatible" #: apt-pkg/pkgcache.cc:142 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "" +msgstr "Este APT non soporta o sistema de versionamento \"%s\"" #: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" -msgstr "" +msgstr "A caché de paquetes construiuse para unha arquitectura diferente" #: apt-pkg/pkgcache.cc:218 msgid "Depends" -msgstr "" +msgstr "Depende" #: apt-pkg/pkgcache.cc:218 msgid "PreDepends" -msgstr "" +msgstr "PreDepende" #: apt-pkg/pkgcache.cc:218 msgid "Suggests" -msgstr "" +msgstr "Suxire" #: apt-pkg/pkgcache.cc:219 -#, fuzzy msgid "Recommends" -msgstr "Paquetes recomendados" +msgstr "Recomenda" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "" +msgstr "Conflicto con" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" -msgstr "" +msgstr "Substitúe a" #: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" -msgstr "" +msgstr "Fai obsoleto a" #: apt-pkg/pkgcache.cc:231 msgid "important" -msgstr "" +msgstr "importante" #: apt-pkg/pkgcache.cc:231 msgid "required" -msgstr "" +msgstr "requirido" #: apt-pkg/pkgcache.cc:231 msgid "standard" -msgstr "" +msgstr "estándar" #: apt-pkg/pkgcache.cc:232 msgid "optional" -msgstr "" +msgstr "opcional" #: apt-pkg/pkgcache.cc:232 msgid "extra" -msgstr "" +msgstr "extra" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" -msgstr "" +msgstr "A construír a árbore de dependencias" #: apt-pkg/depcache.cc:61 -#, fuzzy msgid "Candidate versions" -msgstr " Candidato: " +msgstr "Versións candidatas" #: apt-pkg/depcache.cc:90 msgid "Dependency generation" -msgstr "" +msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:73 -#, fuzzy, c-format +#: apt-pkg/tagfile.cc:72 +#, c-format msgid "Unable to parse package file %s (1)" -msgstr "Non se puido localizar o paquete %s" +msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:160 -#, fuzzy, c-format +#: apt-pkg/tagfile.cc:102 +#, c-format msgid "Unable to parse package file %s (2)" -msgstr "Non se puido localizar o paquete %s" +msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "" +msgstr "Liña %lu mal formada na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "" +msgstr "Liña %lu mal formada na lista de fontes %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "" +msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" +msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" +msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" -msgstr "" +msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "" +msgstr "Liña %u longa de máis na lista de fontes %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "" +msgstr "Liña %u mal formada na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "" +msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "" +msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2331,220 +2376,241 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"Esta instalación ha requirir que se elimine temporalmente o paquete esencial " +"%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, " +"pero se o quere facer, active a opción APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "" +msgstr "O tipo de ficheiros de índices \"%s\" non está soportado" #: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" +"O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo." #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" +"Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado " +"por paquetes retidos." #: apt-pkg/algorithms.cc:1061 -#, fuzzy msgid "Unable to correct problems, you have held broken packages." -msgstr "Non se puideron correxir os paquetes que faltan." +msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." -msgstr "" +msgstr "O directorio de listas %spartial falla." #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "" +msgstr "O directorio de arquivos %spartial falla." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "A obter o ficheiro %li de %li (fallan %s)" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "A obter o ficheiro %li de %li" #: apt-pkg/acquire-worker.cc:113 -#, fuzzy, c-format +#, c-format msgid "The method driver %s could not be found." -msgstr "Non se puideron ler as listas de fontes." +msgstr "Non se puido atopar o controlador de métodos %s." #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" -msgstr "" +msgstr "O método %s non se iniciou correctamente" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Troco de medio: Por favor insire o disco etiquetado\n" -" '%s'\n" -"na unidade '%s' e prema Intro\n" +msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "" +msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:135 -#, fuzzy +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" -msgstr "Non se puido atopar un paquete de fontes para %s" +msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" #: apt-pkg/clean.cc:61 -#, fuzzy, c-format +#, c-format msgid "Unable to stat %s." -msgstr "A: Non se puido ler %s\n" +msgstr "Non se pode analizar %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "" +msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list" #: apt-pkg/cachefile.cc:73 -#, fuzzy msgid "The package lists or status file could not be parsed or opened." -msgstr "Non se puideron ler as listas de fontes." +msgstr "" +"Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado." #: apt-pkg/cachefile.cc:77 -#, fuzzy msgid "You may want to run apt-get update to correct these problems" -msgstr "Tal vez queira executar `apt-get -f install' para correxilo:" +msgstr "Pode querer executar apt-get update para corrixir estes problemas" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" msgstr "" +"Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira " +"Package" #: apt-pkg/policy.cc:291 #, c-format msgid "Did not understand pin type %s" -msgstr "" +msgstr "Non se entendeu o tipo de inmobilización %s" #: apt-pkg/policy.cc:299 msgid "No priority (or zero) specified for pin" msgstr "" +"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" -msgstr "" +msgstr "A caché ten un sistema de versionamento incompatible" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" +msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" +msgstr "Guau, superou o número de versións que este APT pode manexar." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" +msgstr "Guau, superou o número de dependencias que este APT pode manexar." #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "" +msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "" +msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" #: apt-pkg/pkgcachegen.cc:574 -#, fuzzy, c-format +#, c-format msgid "Couldn't stat source package list %s" -msgstr "Non se puido atopar o paquete %s" +msgstr "Non se atopou a lista de paquetes fonte %s" #: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" -msgstr "" +msgstr "A recoller as provisións de ficheiros" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "" +msgstr "Erro de E/S ao gravar a caché de fontes" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "" +msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" +msgstr "Os MD5Sum non coinciden" + +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" msgstr "" +"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:753 #, 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 "" +"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " +"ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" +"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " +"ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" +"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " +"Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "" +msgstr "Os tamaños non coinciden" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "" +msgstr "O bloque de provedor %s non contén unha pegada dixital" #: apt-pkg/cdrom.cc:507 #, c-format @@ -2552,46 +2618,49 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" +"A empregar o punto de montaxe de CD-ROMs %s\n" +"A montar o CD-ROM\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "" +msgstr "A identificar.. " #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "" +msgstr "Etiqueta armacenada: %s \n" #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "" +msgstr "A empregar o punto de montaxe de CD-ROMs %s\n" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "" +msgstr "A desmontar o CD-ROM\n" #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" -msgstr "" +msgstr "A agardar polo disco...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "" +msgstr "A montar o CD-ROM...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "" +msgstr "A buscar os ficheiros de índices no disco..\n" #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" +"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "" +msgstr "Ese non é un nome válido, volva tentalo.\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2599,93 +2668,109 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" +"Este disco chámase: \n" +"\"%s\"\n" #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." -msgstr "" +msgstr "A copiar as listas de paquetes..." #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" -msgstr "" +msgstr "A gravar a nova lista de fontes\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "" +msgstr "As entradas da lista de fontes deste disco son:\n" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "" +msgstr "A desmontar o CD-ROM..." #: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" -msgstr "" +msgstr "Graváronse %i rexistros.\n" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "" +msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "" +msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" +"Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " +"coinciden\n" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Preparing %s" -msgstr "" +msgstr "A preparar %s" #: apt-pkg/deb/dpkgpm.cc:359 #, c-format msgid "Unpacking %s" -msgstr "" +msgstr "A desempaquetar %s" #: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Preparing to configure %s" -msgstr "" +msgstr "A se preparar para configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Configuring %s" -msgstr "" +msgstr "A configurar %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalados: " +msgstr "Instalouse %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "A se preparar para a eliminación de %s" #: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removing %s" -msgstr "" +msgstr "A eliminar %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Paquetes recomendados" +msgstr "Eliminouse %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "" +msgid "Preparing to completely remove %s" +msgstr "A se preparar para eliminar %s completamente" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "" +msgid "Completely removed %s" +msgstr "Eliminouse %s completamente" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "" +msgstr "A conexión pechouse prematuramente" + +#~ msgid "Reading file list" +#~ msgstr "A ler a lista de paquetes" + +#~ msgid "Could not execute " +#~ msgstr "Non se puido executar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "A se preparar para a eliminación con config %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Eliminouse con config %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-01-04 18:51+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n" "Language-Team: Hebrew\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@ -192,6 +192,18 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@ -414,12 +426,12 @@ msgstr "" msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "המתחזק של %s הוא %s ולא %s\n" @@ -519,79 +531,79 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "לחבילות הבאות יש תלויות שלא נענו:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "אבל %s מותקנת" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "אבל היא אינה ניתנת להתקנה" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "אבל היא חבילה וירטואלית" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "אבל היא לא מותקנת" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "אבל היא אינה הולכת להיות מותקנת" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr "או" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "החבילות הבאות יוסרו:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "החבילות הבאות מעובות:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "החבילות הבאות ישודרגו מטה:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "החבילות המחוזקות הבאות ישונו:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (בגלל %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -600,144 +612,144 @@ msgstr "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "מתקן תלויות..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr "כשלון." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "לא מצליח לתקן תלויות" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr "סיום" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "כן, עשה כפי שאני אומר!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -745,75 +757,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "בטל." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -821,79 +833,79 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1525 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1555 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1558 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1570 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" @@ -901,159 +913,164 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1578 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1583 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1586 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1612 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1683 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1684 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1704 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1712 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1959 +#, c-format +msgid "Skiping already downloaded file '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:1983 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1991 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2028 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2056 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2068 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2069 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2086 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2105 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2121 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2149 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2169 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2221 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2273 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2308 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2333 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2347 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2351 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2383 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2424 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1254,7 +1271,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "כשלון בפענוח %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1307,7 +1324,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1603,7 +1621,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1734,76 +1752,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1177 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" @@ -1816,7 +1834,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1937,7 +1955,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2104,52 +2122,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2193,7 +2211,7 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2213,12 +2231,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2336,31 +2354,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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:775 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "" @@ -1,21 +1,21 @@ -# Advanced Package Transfer - APT message translation catalog -# Hungarian messages -# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002. -# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005. -# +# Advanced Package Transfer - APT message translation catalog
+# Hungarian messages
+# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005.
+#
msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-15 18:03+0100\n" -"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-04-30 06:14+0100\n" +"Last-Translator: SZERVÑC Attila <sas@321.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: cmdline/apt-cache.cc:135 #, c-format @@ -27,7 +27,7 @@ msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n" #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "%s csomag nem található" +msgstr "Az alábbi csomag nem található: %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " @@ -149,14 +149,14 @@ msgstr " Verziótáblázat:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -230,6 +230,18 @@ msgstr "" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további információért.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Adj egy nevet e lemezhez, mint például 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Tégy be egy lemezt a meghajtóba és üss enter-t" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Ismételd meg e folyamatot készleted többi CD-jével is." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Az argumentumok nincsenek párban" @@ -469,7 +481,7 @@ msgstr "H: Hibás a fájl " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "Nem sikerült feloldani a következőt: %s" +msgstr "Nem sikerült feloldani ezt: %s" #: ftparchive/writer.cc:163 msgid "Tree walking failed" @@ -506,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" @@ -515,12 +527,12 @@ msgstr "%s elérése sikertelen" msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" @@ -613,392 +625,388 @@ msgstr "Olvasási hiba az MD5 kiszámításakor" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "Probléma %s unlinkelésekor" +msgstr "Hiba %s elláncolásakor" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" +msgstr "Nem sikerült átnevezni %s-t erre: %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" -msgstr "A következő csomagoknak teljesítetlen függőségei vannak:" +msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " vagy" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "A következő ÚJ csomagok lesznek telepítve:" +msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "A következő csomagok el lesznek TÁVOLÍTVA:" +msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "A következő csomagok vissza lesznek tartva:" +msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "A következő csomagok frissítve lesznek:" +msgstr "Az alábbi csomagok frissítve lesznek:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "A következő csomagok VISSZA lesznek fejlesztve:" +msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "A következő visszatartott csomagok fel lesznek váltva:" +msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" -"Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!" +"FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n" +"NE tedd ezt, míg nem tudod pontosan, mit csinálsz!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, " +msgstr "%lu frissített, %lu újonnan telepített, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "%lu újra lesz telepítve, " +msgstr "%lu újratelepítendő, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " -msgstr "%lu vissza lesz fejlesztve, " +msgstr "%lu kerül öregbítésre, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu el lesz távolítva és %lu nem lesz frissítve.\n" +msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n" +msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!" +msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "A hitelesítési figyelmeztetést átléptem.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? " +msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (y/N)? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Belső hiba egy eltérítés hozzáadásakor" +msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Az archívumokból %sB/%sB-t kell letölteni.\n" +msgstr "Letöltendő az archívumokból: %sB/%sB\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "%sB-t kell letölteni az archívumokból.\n" +msgstr "Letöltés az archívumokból: %sB\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n" +msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n" +msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Nincs elég szabad hely itt: %s" +msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "Nincs elég szabad hely itt: %s." +msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Ártalmasnak tűnő műveletet készülsz végrehajtani\n" -"A folytatáshoz írd be a következő kifejezést '%s'\n" +"Ártalmasnak tűnő műveletet készülsz végrehajtani.\n" +"A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Nem sikerült letölteni a következőt: %s %s\n" +msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 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:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et " -"vagy a --fix-missing -et." +"Nem lehet letölteni néhány archívumot.\n" +" Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing és a média csere még nem támogatott" +msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "A(z) %s csomag nincs telepítve, így nem távolítható el\n" +msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "A(z) %s egy virtuális csomag, amit a következő szolgáltat:\n" +msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Egyet határozottan ki kell választanod telepítésre." +msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"A(z) %s csomagnak nincs elérhető verziója, de egy másik csomag\n" -"hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n" -"vagy csak más forrásból érhető el\n" +"%s csomag nem elérhető, de egy másikhivatkozik rá\n" +".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "Azonban a következő csomagok felváltják:" +msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez" +msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a " -"régi változatuk lesz használva." +"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " +"változatukat használom." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" -msgstr "Nem található a(z) %s csomag" +msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "" -"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" +msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1006,7 +1014,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1018,7 +1026,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,118 +1036,122 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "A következő információ talán segít megoldani a helyzetet:" +msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "A következő extra csomagok kerülnek telepítésre:" +msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Belső hiba, AllUpgrade megsértett valamit" +msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "A már letöltött '%s' fájl kihagyása\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, 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:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1148,7 +1160,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1157,32 +1169,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verziókövetelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1350,8 +1362,7 @@ msgstr "vagy hiányzó függőségek miatti hibákat. Ez így OK, csak az ezen #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"előtti hibák fontosak. Kérem javítsa azokat és futtassa az [I]nstallt újra" +msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra" #: dselect/update:30 msgid "Merging available information" @@ -1384,11 +1395,11 @@ msgstr "Érvénytelen archívum-aláírás" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Hiba az archívtag-fejléc olvasásakor" +msgstr "Hiba az archívum tag fejléc olvasásakor" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Érvénytelen archívtag-fejléc" +msgstr "Érvénytelen archívum tag fejléc" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" @@ -1400,7 +1411,7 @@ msgstr "Nem sikerült olvasni az archívum fejléceket" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode hívása egy még mindig kapcsolódó node-ra történt" +msgstr "DropNode hívása egy még mindig láncolt node-ra történt" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1430,11 +1441,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Nem sikerült a(z) %s fájlba írni" +msgstr "%s fájl írása sikertelen" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Nem sikerült a(z) %s fájlt bezárni" @@ -1487,10 +1498,11 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" -msgstr "A(z) %s nem olvasható" +msgstr "%s nem olvasható" #: apt-inst/extract.cc:494 #, c-format @@ -1533,7 +1545,7 @@ msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani" msgid "Internal error getting a package name" msgstr "Belső hiba a csomagnév elhozásakor" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Fájllista olvasása" @@ -1580,19 +1592,15 @@ msgstr "Belső hiba egy eltérítés hozzáadásakor" msgid "The pkg cache must be initialized first" msgstr "A csomag gyorsítótárnak előbb kell inicializálva lennie" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Fájllista olvasása" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Nem sikerült megtalálni a csomag-fejlécet, offszet %lu" +msgstr "Nem találom a csomag-fejlécet, offszet %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Hibás ConfFile szekció a státusz fájlban. Offszet %lu" +msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1607,8 +1615,7 @@ msgstr "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "" -"Ez nem egy érvényes DEB archív, hiányzik a(z) \"%s\" vagy a(z) \"%s\" tag" +msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1647,27 +1654,24 @@ msgstr "Hibás CD" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" -"Nem lehet leválasztani a(z) %s meghajtóban levő CD-ROM-ot, talán még " -"használod." +msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Nem találom a fájlt" +msgstr "Nem találom a lemezt" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nem találom a fájlt" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Nem sikerült beállítani a módosítási időt" +msgstr "A módosítási időt beállítása sikertelen" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1676,7 +1680,7 @@ msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Belépés" +msgstr "Bejelentkezés a kiszolgálóra:" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" @@ -1689,17 +1693,17 @@ msgstr "Nem lehet a helyi nevet megállapítani" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "A kiszolgáló visszautasította a kapcsolatot, és azt mondta: %s" +msgstr "A kiszolgáló megtagadta a kapcsolatot: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Hibás USER, a kiszolgáló azt mondta: %s" +msgstr "Hibás USER, a kiszolgáló üzenete: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Hibás PASS, a kiszolgáló azt mondta: %s" +msgstr "Hibás PASS, a kiszolgáló üzenete: %s" #: methods/ftp.cc:237 msgid "" @@ -1712,12 +1716,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló azt mondta: %s" +msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Hibás TYPE, a kiszolgáló azt mondta: %s" +msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1749,8 +1753,7 @@ msgstr "Nem lehet létrehozni a socket-et" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" -"Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időkeretet" +msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1784,24 +1787,24 @@ msgstr "Ismeretlen a(z) %u címcsalád (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Hibás EPRT, a kiszolgáló azt mondta: %s" +msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" +msgstr "Az adat sockethez kapcsolódás túllépte az időt" #: methods/ftp.cc:825 msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Nem lehet letölteni a fájlt, a kiszolgáló azt mondta '%s'" +msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1810,21 +1813,21 @@ msgstr "Az adat socket túllépte az időt" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Adatátvitel sikertelen, a kiszolgáló azt mondta '%s'" +msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nem lehet meghívni " #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "Csatlakozás a következőhöz: %s (%s)" +msgstr "Csatlakozás: %s (%s)" #: methods/connect.cc:71 #, c-format @@ -1834,87 +1837,87 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "socket létrehozása sikertelen a következőhöz: %s (f=%u t=%u p=%u)" +msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Kapcsolat létrehozása sikertelen a következőhöz: %s: %s (%s)." +msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Nem lehet kapcsolódni a következőhöz: %s: %s (%s)." +msgstr "Nem lehet ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Kapcsolódás a következőhöz: %s" +msgstr "Kapcsolódás: %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Nem lehet kapcsolódni következőhöz: %s %s:" +msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nem lehet feloldani a következőt: '%s' " + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "1 vagy több érvénytelen aláírást találtam." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Nem sikerült zárolni: %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " az aláírás igazolásához (a gnupg telepítve van?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "A következő extra csomagok kerülnek telepítésre:" +msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n" #: methods/gzip.cc:57 #, c-format @@ -1926,80 +1929,80 @@ msgstr "Nem lehet csövet nyitni ehhez: %s" msgid "Read error from %s process" msgstr "Olvasási hiba a(z) %s folyamattól" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" -msgstr "Kapcsolódás sikertelen" +msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Belső hiba" -# FIXME +# FIXME
#: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" @@ -2009,7 +2012,7 @@ msgstr "Nem lehet mmap-olni egy üres fájlt" msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "A(z) %s kiválasztás nem található" @@ -2114,7 +2117,7 @@ msgstr "%s opció egész és nem %s típusú argumentumot követel meg" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "A(z) %s opció túl hosszú" +msgstr "Túl hosszú %s opció" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2129,12 +2132,12 @@ msgstr "%s érvénytelen művelet" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "%s csatlakoztatási pont nem érhető el" +msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" -msgstr "Nem sikerült a következőre váltani: %s" +msgstr "Nem sikerült ide váltani: %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" @@ -2197,15 +2200,15 @@ msgstr "írás, még kiírandó %lu de ez nem lehetséges" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "Probléma a fájl bezárásakor" +msgstr "Hiba a fájl bezárásakor" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Probléma a fájl unlinkelésével" +msgstr "Hiba a fájl leválasztásával" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "Probléma a fájl szinkronizálásakor" +msgstr "Hiba a fájl szinkronizálásakor" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@ -2286,64 +2289,64 @@ msgstr "Lehetséges verziók" #: apt-pkg/depcache.cc:90 msgid "Dependency generation" -msgstr "Függőséggenerálás" +msgstr "Függőség-generálás" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" +msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" @@ -2368,21 +2371,21 @@ msgstr "A(z) '%s' indexfájltípus nem támogatott" #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot." +msgstr "" +"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá." #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott " +"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." msgstr "" -"A problémák nem javíthatók, sérült visszatartott csomagok vannak a " -"rendszeren." +"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." #: apt-pkg/acquire.cc:62 #, c-format @@ -2394,10 +2397,17 @@ msgstr "%spartial listakönyvtár hiányzik." msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Fájlletöltés: %li/%li (%s van hátra)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Fájllista olvasása" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2410,21 +2420,18 @@ msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Kérlek tedd be a(z)\n" -" %s\n" -"címkéjű lemezt a(z) %s meghajtóba és üss entert\n" +msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" -msgstr "A megfelelő csomagrendszer típusa nem határozható meg" +msgstr "A megfelelő csomagrendszer típus nem határozható meg" #: apt-pkg/clean.cc:61 #, c-format @@ -2433,7 +2440,7 @@ msgstr "%s nem érhető el." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Néhány 'source' URI-t bele kell tenned a sources.list fájlodba" +msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2442,8 +2449,7 @@ msgstr "" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Próbáld futtatni az apt-get update -et, hogy javítsd ezeket a problémákat" +msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" @@ -2465,37 +2471,37 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)" +msgstr "Hiba történt %s feldolgozásakor (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)" +msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)" +msgstr "Hiba történt %s feldolgozásakor (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)" +msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2515,12 +2521,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)" +msgstr "Hiba történt %s feldolgozásakor (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)" +msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2533,7 +2539,7 @@ msgstr "" msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -# FIXME +# FIXME
#: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" @@ -2547,36 +2553,40 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" + +#: apt-pkg/acquire-item.cc:753 #, 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 "" -"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " +"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " +"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2591,8 +2601,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"%s CD-ROM csatlakoztatási pont használata\n" -"CD-ROM csatlakoztatása\n" +"%s CD-ROM csatolási pont használata\n" +"CD-ROM csatolása\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " @@ -2606,7 +2616,7 @@ msgstr "Tárolt címke: %s \n" #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "%s CD-ROM csatlakoztatási pont használata\n" +msgstr "%s CD-ROM csatolási pont használata\n" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" @@ -2619,20 +2629,22 @@ msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM csatlakoztatása...\n" +msgstr "CD-ROM felcsatolása...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" #: apt-pkg/cdrom.cc:647 -#, c-format +#, fuzzy, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" +msgstr "" +"%i csomagindexet, %i forrásindexet, %i fordításindexet és %i aláírást " +"találtam\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "Ez a név érvénytelen, próbálja újra.\n" +msgstr "E név érvénytelen, próbáld újra.\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2640,7 +2652,7 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Ezen lemez neve: \n" +"E lemez neve: \n" "%s\n" #: apt-pkg/cdrom.cc:730 @@ -2653,7 +2665,7 @@ msgstr "Új forráslista írása\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Ezen lemezhez tartozó forráslista-bejegyzések a következők:\n" +msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." @@ -2680,55 +2692,87 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "%s megnyitása" +msgstr "%s előkészítése" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "%s megnyitása" +msgstr "%s kicsomagolása" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "%s konfigurációs fájl megnyitása" +msgstr "%s konfigurálásának előkészítése" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Kapcsolódás a következőhöz: %s" +msgstr "%s konfigurálása" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Telepítve: " +msgstr "Telepített %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "%s eltávolításának előkészítése" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "%s megnyitása" +msgstr "%s eltávolítása" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Ajánlja" +msgstr "Eltávolított %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "%s konfigurálásának előkészítése" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "%s eltávolítása sikertelen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "A kapcsolat idő előtt befejeződött" +msgstr "A kapcsolat idő előtt lezárult" + +#~ msgid "Total Distinct Descriptions: " +#~ msgstr "Összes külső leírás: " + +#~ msgid "Total Desc/File relations: " +#~ msgstr "Összes Leírás/Fájl kapcsolat: " + +#~ msgid "Reading file list" +#~ msgstr "Fájllista olvasása" + +#~ msgid "Could not execute " +#~ msgstr "Nem futtatható" + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" + +#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#~ msgstr "" +#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni " +#~ "tud!" + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával" + +#~ msgid "Removed with config %s" +#~ msgstr "%s konfigurálásával eltávolítva" + +#~ msgid "Could not patch file" +#~ msgstr "%s fájl foltozása sikertelen" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-10-05 17:38+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-02-14 11:41+0100\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" "MIME-Version: 1.0\n" @@ -84,11 +84,11 @@ msgstr "Totale spazio occupato: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "Il file dei pacchetti %s desincronizzato." +msgstr "Il file dei pacchetti %s non sincronizzato." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Bisogna dare solamente un pattern" +msgstr "Bisogna specificare un singolo pattern" #: cmdline/apt-cache.cc:1385 msgid "No packages found" @@ -101,7 +101,7 @@ msgstr "File dei pacchetti:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"La cache desincronizzata, impossibile referenziare un file di pacchetti" +"La cache non sincronizzata, impossibile referenziare un file di pacchetti" #: cmdline/apt-cache.cc:1470 #, c-format @@ -145,14 +145,14 @@ msgstr " Tabella versione:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,18 @@ msgstr "" "Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori " "informazioni\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Inserire un disco nel drive e premere invio" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Ripetere questo processo per il resto dei CD." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argomenti non in coppia" @@ -373,7 +385,7 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n" -"molti stili di generazione da completamente automatici a alternative " +"molti stili di generazione da completamente automatici a alternative\n" "funzionali per dpkg-scanpackages e dpkg-scansources\n" "\n" "apt-ftparchive genera file Packages da un albero di .deb. Il\n" @@ -382,12 +394,12 @@ msgstr "" " supportato per forzare il valore di Priorit e Sezione.\n" "\n" "Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n" -"L'opzione --source-override pu essere usata per specificare un file di " -"override per i sorgenti\n" +"L'opzione --source-override pu essere usata per specificare un file\n" +"di override per i sorgenti\n" "\n" -"I comandi 'packages' e 'sources' devono essere seguiti nella root \n" +"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n" "dell'albero. BinaryPath deve puntare alla base della ricerca \n" -"ricorsiva e il file override devecontenere le opzioni di override. " +"ricorsiva e il file override deve contenere le opzioni di override.\n" "Pathprefix \n" " aggiunto al campo filename se presente. Esempio di utilizzo \n" "dall'archivio debian:\n" @@ -436,7 +448,7 @@ msgstr "La data del file cambiata %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "L'Archivio non ha un campo control" +msgstr "L'archivio non ha un campo control" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -504,7 +516,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Impossibile analizzare %s" @@ -513,12 +525,12 @@ msgstr "Impossibile analizzare %s" msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantainer %s non %s\n" @@ -581,12 +593,12 @@ msgstr "Impossibile eseguire fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "Figlio compresso" +msgstr "Sottoprocesso compresso" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Errore interno, Impossibile creare %s" +msgstr "Errore interno, impossibile creare %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" @@ -618,79 +630,79 @@ msgstr "Problema nell'unlink di %s" msgid "Failed to rename %s to %s" msgstr "Impossibile rinominare %s in %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ma %s installato" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ma %s sta per essere installato" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ma non installabile" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ma un pacchetto virtuale" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ma non installato" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " oppure" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -699,149 +711,149 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi (downgraded), " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " fallita." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" " consigliabile eseguire `apt-get -f install' per correggere questi problemi." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato \n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Non stato possibile autenticare alcuni pacchetti" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y stata usata senza --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages stato chiamato con un pacchetto rotto!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non terminato" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Che strano... le dimensioni non corrispondono, inviare un'email a " "apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr " necessario prendere %sB/%sB di archivi. \n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr " necessario prendere %sB di archivi. \n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Lo spazio libero in %s non sufficente." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" " stata specificata la modalit Trivial Only ma questa non un'operazione " "triviale" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -852,28 +864,28 @@ msgstr "" "Per continuare scrivere la frase '%s' \n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -881,103 +893,102 @@ msgstr "" "Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update " "o provare l'opzione --fix-missing" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non ancora supportato" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s stato saltato, perch gi installato e l'aggiornamento non stato " "impostato.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Il pacchetto %s non ha versioni disponibili, ma ma nominato da un " -"altropacchetto.\n" -" Questo significa che il pacchetto manca, diventato obsoletoo " -"disponibile solo all'interno di un'altra sorgente\n" +"Il pacchetto %s non ha versioni disponibili, ma nominato da un altro\n" +"pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n" +"o disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La reinstallazione di %s non possibile, non pu esssere scaricato.\n" +msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s gi alla versione pi recente.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non stata trovata la release '%s' per '%s'" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non stata trovata la versione '%s' per '%s'" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -985,26 +996,26 @@ msgstr "" "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" " consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1012,7 +1023,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1024,126 +1035,131 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Poich stata richiesta solo una singola operazione molto facile che\n" +"Poich stata richiesta solo una singola operazione molto facile che\n" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" -msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" +msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Si saltato il file gi scaricato '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficente" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1168,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,32 +1177,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch nessuna versione " "del pacchetto %s pu soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s " " troppo nuovo" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1448,7 +1464,7 @@ msgstr "File di configurazione duplice %s/%s" msgid "Failed to write file %s" msgstr "Impossibile scrivere il file %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s fallita" @@ -1502,7 +1518,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@ -1548,7 +1565,7 @@ msgstr "Impossibile raggiungere la directory admin %sinfo" msgid "Internal error getting a package name" msgstr "Errore interno nel prendere un nome di un pacchetto" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lettura della lista dei file in corso" @@ -1595,10 +1612,6 @@ msgstr "Errore interno nell'aggiunta di una diversion" msgid "The pkg cache must be initialized first" msgstr "La cache dei pacchetti deve prima essere inizializzata" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Lettura della lista dei file in corso" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1671,12 +1684,12 @@ msgstr "Disco non trovato" msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossibile analizzare" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" @@ -1805,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1828,7 +1841,7 @@ msgstr "Trasferimento dei dati fallito, il server ha detto '%s'" msgid "Query" msgstr "Query" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -1858,72 +1871,73 @@ msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Impossibile risolvere '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "risoluzione di '%s' temporaneamete fallita" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr " accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Impossibile risolvere '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: Firma corretta, ma non stato possibile determinare il " "fingerprint della chiave?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "Almeno una firma non valida stata trovata." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Impossibile eseguire " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " per verificare la firma (gnugp installato?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1941,77 +1955,77 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Si ottenuto una singola linea di header su %u caratteri" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Errore interno" @@ -2024,7 +2038,7 @@ msgstr "Impossibile eseguire mmap su un file vuoto" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" @@ -2149,7 +2163,7 @@ msgstr "Operazione non valida %s" msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" @@ -2307,62 +2321,62 @@ msgstr "Versioni candidate" msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La linea %lu in %s (URI) non corretta" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La linea %lu in %s (dist) non corretta" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La linea %lu in %s (URI parse) non corretta" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non corretta" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La linea %lu in %s (dist parse) non corretta" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La linea %u in %s (type) non corretta" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgente %s" +msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgenti %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non corretta" @@ -2413,11 +2427,18 @@ msgstr "Manca la directory di liste %spartial." msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" msgstr "Scaricamento del file %li di %li (%s rimanente)" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Lettura della lista dei file in corso" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2435,12 +2456,12 @@ msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non supportato" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2566,11 +2587,16 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente" msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" +"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2580,7 +2606,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2589,7 +2615,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2597,7 +2623,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2741,278 +2767,27 @@ msgid "Removed %s" msgstr "%s rimosso" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "Preparazione per la rimozione con la configurazione %s in corso" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparazione alla configurazione di %s in corso" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "Rimosso con la configurazione %s" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Impossibile rimuovere %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" -#~ msgid "Write Error" -#~ msgstr "Errore di Scrittura" - -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto" - -#~ msgid "File Not Found" -#~ msgstr "File Non Trovato" - -#~ msgid "" -#~ "Some broken packages were found while trying to process build-" -#~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." -#~ msgstr "" -#~ "Sono stati trovati dei pacchetti con errori mentre si cercava di " -#~ "cotruire\n" -#~ "le dipendenze. Si consiglia di eseguire `apt-get -f install` per " -#~ "correggerli." - -#~ msgid "<- '" -#~ msgstr "<- '" - -#~ msgid "'" -#~ msgstr "'" - -#~ msgid "-> '" -#~ msgstr "-> '" - -#~ msgid "Followed conf file from " -#~ msgstr "Si ÃÂÃ
¡ seguito il file di configurazione da " - -#~ msgid " to " -#~ msgstr " a " - -#~ msgid "Extract " -#~ msgstr "Estratto " - -#~ msgid "Aborted, backing out" -#~ msgstr "Abortito, ripristino in corso" - -#~ msgid "De-replaced " -#~ msgstr "Non sostituito" - -#~ msgid " from " -#~ msgstr " da " +#~ msgid "Reading file list" +#~ msgstr "Lettura della lista dei file in corso" -#~ msgid "Backing out " -#~ msgstr "Ripristino in corso " +#~ msgid "Could not execute " +#~ msgstr "Impossibile eseguire " -#~ msgid " [new node]" -#~ msgstr " [nuovo nodo]" +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso" -#~ msgid "Replaced file " -#~ msgstr "File sostituito " - -#~ msgid "Internal Error, Unable to parse a package record" -#~ msgstr "Errore interno, Impossibile analizzare un campo del pacchetto" - -#~ msgid "Unimplemented" -#~ msgstr "Non Implementato" - -#~ msgid "You must give at least one file name" -#~ msgstr "Bisogna dare almeno un nome di un file" - -#~ msgid "Generating cache" -#~ msgstr "Generazione cache in corso" - -#~ msgid "Problem with SelectFile" -#~ msgstr "Problemi con SelectFile" - -#~ msgid "Problem with MergeList" -#~ msgstr "Problemi con MergeList" - -#~ msgid "Regex compilation error" -#~ msgstr "Errore nella compilazione della regex" - -#~ msgid "Write to stdout failed" -#~ msgstr "Scrittura su stdout fallita" - -#~ msgid "Generate must be enabled for this function" -#~ msgstr "Generate deve essere abilitata per questa funzione" - -#~ msgid "Failed to stat %s%s" -#~ msgstr "Impossibile analizzare %s%s" - -#~ msgid "Failed to open %s.new" -#~ msgstr "Impossibile aprire %s.new" - -#~ msgid "Failed to rename %s.new to %s" -#~ msgstr "Impossibile rinominare %s.new in %s" - -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "Inserire un disco nel drive e premere invio" - -#~ msgid "I found (binary):" -#~ msgstr "Trovati (binary):" - -#~ msgid "I found (source):" -#~ msgstr "Trovati (source):" - -#~ msgid "Found " -#~ msgstr "Trovato " - -#~ msgid " source indexes." -#~ msgstr " sorgenti indicizzati." - -#~ msgid "" -#~ "Unable to locate any package files, perhaps this is not a Debian Disc" -#~ msgstr "Impossibile trovare file di pacchetti, forse questo non ÃÂÃ
¡ un disco Debian" - -#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -#~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" - -#~ msgid " '" -#~ msgstr " '" - -#~ msgid "Repeat this process for the rest of the CDs in your set." -#~ msgstr "Ripetere questo processo per il resto dei CD." - -#~ msgid "" -#~ "Usage: apt-cdrom [options] command\n" -#~ "\n" -#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n" -#~ "CDROM mount point and device information is taken from apt.conf\n" -#~ "and /etc/fstab.\n" -#~ "\n" -#~ "Commands:\n" -#~ " add - Add a CDROM\n" -#~ " ident - Report the identity of a CDROM\n" -#~ "\n" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " -d CD-ROM mount point\n" -#~ " -r Rename a recognized CD-ROM\n" -#~ " -m No mounting\n" -#~ " -f Fast mode, don't check package files\n" -#~ " -a Thorough scan mode\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" -#~ "See fstab(5)\n" -#~ msgstr "" -#~ "Utilizzo: apt-cdrom [opzioni] comando\n" -#~ "\n" -#~ "apt-cdrom ÃÂÃ
¡ un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n" -#~ "mount point del CDROM e l'informazione della periferica sono presi da apt." -#~ "conf\n" -#~ "e /etc/fstab.\n" -#~ "\n" -#~ "Comandi:\n" -#~ " add - Aggiunge un CDROM\n" -#~ " ident - riporta l'identitÃÂàdi un CDROM\n" -#~ "\n" -#~ "Opzioni:\n" -#~ " -h Questo help\n" -#~ " -d Mount point del CDROM\n" -#~ " -r Rinomina un CDROM riconosciuto\n" -#~ " -m Nessun montaggio\n" -#~ " -f ModalitÃÂàveloce, non controlla i file dei pacchetti\n" -#~ " -a Scansione in modalitÃÂàaccurata\n" -#~ " -c=? Legge come configurazione il file specificato\n" -#~ " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" -#~ "Vedere fstab(5)\n" - -#~ msgid "Internal Error, non-zero counts" -#~ msgstr "Errore interno, contatori non a zero" - -#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." -#~ msgstr "" -#~ "Spiacente, spazio su disco insufficente in %s per tenere tutti i " -#~ "pacchetti." - -#~ msgid "Couldn't wait for subprocess" -#~ msgstr "Impossibile attendere il sottoprocesso" - -#~ msgid "....\"Have you mooed today?\"..." -#~ msgstr "....\"Hai muggito oggi?\"..." - -#~ msgid " New " -#~ msgstr " Nuovo " - -#~ msgid "B " -#~ msgstr "B " - -#~ msgid " files " -#~ msgstr " file " - -#~ msgid " pkgs in " -#~ msgstr " pacchetti in " - -#~ msgid "" -#~ "Usage: apt-ftparchive [options] command\n" -#~ "Commands: packges binarypath [overridefile [pathprefix]]\n" -#~ " sources srcpath [overridefile [pathprefix]]\n" -#~ " contents path\n" -#~ " generate config [groups]\n" -#~ " clean config\n" -#~ msgstr "" -#~ "Utilizzo: apt-ftparchive [opzioni] comando\n" -#~ "Comandi: packges binarypath [overridefile [pathprefix]]\n" -#~ " sources srcpath [overridefile [pathprefix]]\n" -#~ " contents path\n" -#~ " generate config [groups]\n" -#~ " clean config\n" - -#~ msgid "" -#~ "Options:\n" -#~ " -h This help text\n" -#~ " --md5 Control MD5 generation\n" -#~ " -s=? Source override file\n" -#~ " -q Quiet\n" -#~ " -d=? Select the optional caching database\n" -#~ " --no-delink Enable delinking debug mode\n" -#~ " --contents Control contents file generation\n" -#~ " -c=? Read this configuration file\n" -#~ " -o=? Set an arbitary configuration option\n" -#~ msgstr "" -#~ "Opzioni:\n" -#~ " -h Questo help\n" -#~ " -md5 Generazione MD5 di controllo\n" -#~ " -s=? file override per i sorgenti.\n" -#~ " -q silenzioso\n" -#~ " -d=? Seleziona il database opzionale per la cache\n" -#~ " -no-delink Abilita la modalitÃÂàdi debug per il delink\n" -#~ " -contents Generazione file contents di controllo\n" -#~ " -c=? Legge come configurazione il file specificato\n" -#~ " -o=? Imposta un'opzione di configurazione\n" - -#~ msgid "Done Packages, Starting contents." -#~ msgstr "Packages terminato, Inizio i contents." - -#~ msgid "Hit contents update byte limit" -#~ msgstr "Limite di byte per l'aggiornamento dei contents processati" - -#~ msgid "Done. " -#~ msgstr "Fatto. " - -#~ msgid "B in " -#~ msgstr "B in " - -#~ msgid " archives. Took " -#~ msgstr " archivi. Sono occorsi" - -#~ msgid "B hit." -#~ msgstr "B hit." - -#~ msgid " not " -#~ msgstr " non " - -#~ msgid "DSC file '%s' is too large!" -#~ msgstr "il file DSC '%s' ÃÂÃ
¡ troppo largo!" - -#~ msgid "Could not find a record in the DSC '%s'" -#~ msgstr "Impossibile trovare un campo nel DSC '%s'" - -#~ msgid "Error parsing file record" -#~ msgstr "Errore nell'analisi del campo file" - -#~ msgid "Failed too stat %s" -#~ msgstr "Impossibile anche analizzare %s" - -#~ msgid "Errors apply to file '%s'" -#~ msgstr "Gli errori si applicano al file `%s'" +#~ msgid "Removed with config %s" +#~ msgstr "Rimosso con la configurazione %s" @@ -8,102 +8,102 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-09 12:54+0900\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-25 20:55+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8 bit\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "ѥå %s ΥС %s ˤϲԲǽʰ¸طޤ:\n" +msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "ѥå %s Ĥ뤳ȤǤޤ" +msgstr "パッケージ %s が見つかりません" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "ѥå̾: " +msgstr "パッケージ名総数: " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " -msgstr " ̾ѥå: " +msgstr " 通常パッケージ: " #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr " 貾ۥѥå: " +msgstr " 純粋仮想パッケージ: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " ñ첾ۥѥå: " +msgstr " 単一仮想パッケージ: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " -msgstr " ʣ精ۥѥå: " +msgstr " 複合仮想パッケージ: " #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr " : " +msgstr " 欠落: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "̥С: " +msgstr "個別バージョン総数: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "¸ط: " +msgstr "依存関係総数: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " -msgstr "С/եط: " +msgstr "バージョン/ファイル関係総数: " #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "ޥåԥ: " +msgstr "提供マッピング総数: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Glob ʸ: " +msgstr "Glob 文字列の総数: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "¸طС: " +msgstr "総依存関係・バージョン容量: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr ": " +msgstr "総空き容量: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "ͭ: " +msgstr "総占有容量: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "Package ե %s ƱƤޤ" +msgstr "Package ファイル %s が同期していません。" #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "ѥϤ礦 1 ĤꤷƤ" +msgstr "パターンはちょうど 1 つだけ指定してください" #: cmdline/apt-cache.cc:1385 msgid "No packages found" -msgstr "ѥåĤޤ" +msgstr "パッケージが見つかりません" #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "ѥåե:" +msgstr "パッケージファイル:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "å夬ƱƤ餺ѥåեȤǤޤ" +msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" #: cmdline/apt-cache.cc:1470 #, c-format @@ -113,48 +113,48 @@ msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "Pin ѥå:" +msgstr "Pin パッケージ:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "(Ĥޤ)" +msgstr "(見つかりません)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " ȡ뤵ƤС: " +msgstr " インストールされているバージョン: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" -msgstr "(ʤ)" +msgstr "(なし)" #. Candidate Version #: cmdline/apt-cache.cc:1522 msgid " Candidate: " -msgstr " : " +msgstr " 候補: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr " ѥå Pin: " +msgstr " パッケージ Pin: " #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr " Сơ֥:" +msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s for %s %s ѥ: %s %s\n" +msgstr "%s %s for %s %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -192,45 +192,58 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"ˡ: apt-cache [ץ] ޥ\n" -" apt-cache [ץ] add file1 [file2 ...]\n" -" apt-cache [ץ] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [ץ] showsrc pkg1 [pkg2 ...]\n" +"使用方法: apt-cache [オプション] コマンド\n" +" apt-cache [オプション] add file1 [file2 ...]\n" +" apt-cache [オプション] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [オプション] showsrc pkg1 [pkg2 ...]\n" "\n" -"apt-cache APT ΥХʥꥭåեꡢ\n" -"ꤹ뤿٥ΥġǤ\n" +"apt-cache は APT のバイナリキャッシュファイルを操作したり、そこから情\n" +"報を検索したりするための低レベルのツールです\n" "\n" -"ޥ:\n" -" add - ѥåեåɲä\n" -" gencaches - ѥåӥå\n" -" showpkg - ñѥåΰ̾ɽ\n" -" showsrc - 쥳ɤɽ\n" -" stats - ܥơɽ\n" -" dump - ƤΥեñʷɽ\n" -" dumpavail - available եɸϤ˽Ϥ\n" -" unmet - ̤ΰ¸طɽ\n" -" search - ɽѥˤäƥѥå\n" -" show - ѥåξɽ\n" -" depends - ѥå¸Ƥѥåɽ\n" -" rdepends - ѥåεհ¸ɽ\n" -" pkgnames - ƤΥѥå̾ɽ\n" -" dotty - GraphVis ѤΥѥåդ\n" -" xvcg - xvcg ѤΥѥåդ\n" -" policy - ݥꥷɽ\n" +"コマンド:\n" +" add - パッケージファイルをソースキャッシュに追加する\n" +" gencaches - パッケージおよびソースキャッシュを生成する\n" +" showpkg - 単一パッケージの一般情報を表示する\n" +" showsrc - ソースレコードを表示する\n" +" stats - 基本ステータス情報を表示する\n" +" dump - すべてのファイルを簡単な形式で表示する\n" +" dumpavail - available ファイルを標準出力に出力する\n" +" unmet - 未解決の依存関係を表示する\n" +" search - 正規表現パターンによってパッケージを検索する\n" +" show - パッケージの情報を表示する\n" +" depends - パッケージが依存しているパッケージを表示する\n" +" rdepends - パッケージの逆依存情報を表示する\n" +" pkgnames - すべてのパッケージ名を表示する\n" +" dotty - GraphVis 用のパッケージグラフを生成する\n" +" xvcg - xvcg 用のパッケージグラフを生成する\n" +" policy - ポリシー設定情報を表示する\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" -p=? ѥåå\n" -" -s=? å\n" -" -q ץ쥹ɽʤ\n" -" -i umnet ޥɤǽפʰ¸Τߤɽ\n" -" -c=? ꤷեɤ߹\n" -" -o=? ꤷꥪץɤ߹ (: -o dir::cache=/tmp)\n" -"ܺ٤ϡapt-cache(8) apt.conf(5) Υޥ˥奢ڡȤƤ\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -p=? パッケージキャッシュ\n" +" -s=? ソースキャッシュ\n" +" -q プログレス表示をしない\n" +" -i umnet コマンドで重要な依存情報のみを表示する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n" +"詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "このディスクに、'Debian 2.1r1 Disk 1' のような名前を付けてください" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "ディスクをドライブに入れて enter を押してください" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" +"あなたの持っている CD セットの残り全部に、この手順を繰り返してください。" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "ڥǤϤޤ" +msgstr "引数がペアではありません" #: cmdline/apt-config.cc:76 msgid "" @@ -247,23 +260,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"ˡ: apt-config [ץ] ޥ\n" +"使用方法: apt-config [オプション] コマンド\n" "\n" -"apt-config APT եɤ߹िδñʥġǤ\n" +"apt-config は APT の設定ファイルを読み込むための簡単なツールです\n" "\n" -"ޥ:\n" -" shell - ⡼\n" -" dump - ɽ\n" +"コマンド:\n" +" shell - シェルモード\n" +" dump - 設定情報を表示する\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" -c=? ꤷեɤߤ\n" -" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する(例: -o dir::cache=/tmp)\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s DEB ѥåǤϤޤ" +msgstr "%s は正しい DEB パッケージではありません。" #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -278,53 +291,52 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"ˡ: apt-extracttemplates ե̾1 [ե̾2 ...]\n" +"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n" "\n" -"apt-extracttemplates debian ѥåȥƥץ졼Ⱦ\n" -"Ф뤿ΥġǤ\n" +"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n" +"抽出するためのツールです\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" -t ǥ쥯ȥꤹ\n" -" -c=? ꤷեɤߤ\n" -" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -t 一時ディレクトリを指定する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" -msgstr "%s ˽ޤ" +msgstr "%s に書き込めません" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -"debconf ΥСǤޤdebconf ϥȡ뤵Ƥޤ?" +"debconf のバージョンを取得できません。debconf はインストールされていますか?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "ѥåĥҥꥹȤĹޤ" +msgstr "パッケージ拡張子リストが長すぎます" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" -msgstr "ǥ쥯ȥ %s ν˥顼ȯޤ" +msgstr "ディレクトリ %s の処理中にエラーが発生しました" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "ĥҥꥹȤĹޤ" +msgstr "ソース拡張子リストが長すぎます" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Contents եؤΥإåν˥顼ȯޤ" +msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "Contents %s ν˥顼ȯޤ" +msgstr "Contents %s の処理中にエラーが発生しました" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -365,826 +377,830 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"ˡ: apt-ftparchive [ץ] ޥ\n" -"ޥ: packages binarypath [overridefile [pathprefix]]\n" +"使用方法: apt-ftparchive [オプション] コマンド\n" +"コマンド: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" " release path\n" " generate config [groups]\n" " clean config\n" "\n" -"apt-ftparchive Debian ѤΥǥåե\n" -"ưΤΤ顢dpkg-scanpackages dpkg-scansources صǽ\n" -"ȤʤΤޤǡ¿ˡݡȤƤޤ\n" +"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n" +"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n" +"となるものまで、多くの生成方法をサポートしています。\n" "\n" -"apt-ftparchive .deb Υĥ Packages եޤ\n" -"Packages ե MD5 ϥåե륵˲äơƥѥå\n" -"Τ٤ƤեɤƤޤǤޤPriority Section \n" -"뤿 override ե뤬ݡȤƤޤ\n" +"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n" +"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n" +"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n" +"を強制するために override ファイルがサポートされています。\n" "\n" -"Ʊͤ apt-ftparchive .dsc Υĥ Sources ե\n" -"--source-override ץѤȥ override ե\n" -"Ǥޤ\n" +"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n" +"す。--source-override オプションを使用するとソース override ファイルを\n" +"指定できます。\n" "\n" -"'packages' 'sources' ޥɤϥĥΥ롼ȤǼ¹Ԥɬפ\n" -"ޤBinaryPath ˤϺƵΥ١ǥ쥯ȥꤷoverride \n" -"ե override ե饰ޤǤɬפޤ⤷ pathprefix \n" -"¸ߤХե̾եɤղäޤdebian ֤Ǥ\n" -"ˡ:\n" +"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n" +"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n" +"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n" +"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n" +"使用方法の例:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" --md5 MD5 椹\n" -" -s=? override ե\n" -" -q ɽ\n" -" -d=? ץΥåǡ١\n" -" --no-delink delinking ǥХå⡼ɤͭˤ\n" -" --contents contents ե椹\n" -" -c=? եɤ\n" -" -o=? Ǥդꥪץꤹ" +"オプション:\n" +" -h このヘルプを表示する\n" +" --md5 MD5 の生成を制御する\n" +" -s=? ソース override ファイル\n" +" -q 表示を抑制する\n" +" -d=? オプションのキャッシュデータベースを選択する\n" +" --no-delink delinking デバッグモードを有効にする\n" +" --contents contents ファイルの生成を制御する\n" +" -c=? 指定の設定ファイルを読む\n" +" -o=? 任意の設定オプションを設定する" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "˥ޥåΤޤ" +msgstr "選択にマッチするものがありません" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "ѥåե륰롼 `%s' ˸ʤե뤬ޤ" +msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB Ƥᡢե̾ %s.old ѹޤ" +msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB Ťᡢ%s Υåץ졼ɤߤޤ" +msgstr "DB が古いため、%s のアップグレードを試みます" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "DB ե %s ȤǤޤ: %s" +msgstr "DB ファイル %s を開くことができません: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "ե %s դѹƤޤ" +msgstr "ファイル %s の日付が変更されています" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "֤쥳ɤޤ" +msgstr "アーカイブにコントロールレコードがありません" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" -msgstr "Ǥޤ" +msgstr "カーソルを取得できません" #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "ٹ: ǥ쥯ȥ %s ɤޤ\n" +msgstr "警告: ディレクトリ %s が読めません\n" #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" -msgstr "ٹ: %s stat Ǥޤ\n" +msgstr "警告: %s の状態を取得できません\n" #: ftparchive/writer.cc:125 msgid "E: " -msgstr "顼: " +msgstr "エラー: " #: ftparchive/writer.cc:127 msgid "W: " -msgstr "ٹ: " +msgstr "警告: " #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "顼: 顼ŬѤե " +msgstr "エラー: エラーが適用されるファイルは " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "%s β˼Ԥޤ" +msgstr "%s の解決に失敗しました" #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "ĥǤΰư˼Ԥޤ" +msgstr "ツリー内での移動に失敗しました" #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" -msgstr "%s Υץ˼Ԥޤ" +msgstr "%s のオープンに失敗しました" #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" -msgstr " %s [%s] ޤ\n" +msgstr " リンク %s [%s] を外します\n" #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "%s readlink ˼Ԥޤ" +msgstr "%s のリンク読み取りに失敗しました" #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "%s unlink ˼Ԥޤ" +msgstr "%s のリンク解除に失敗しました" #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** %s %s ˥Τ˼Ԥޤ" +msgstr "*** %s を %s にリンクするのに失敗しました" #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " ¤ %sB ãޤ\n" +msgstr " リンクを外す制限の %sB に到達しました。\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" -msgstr "%s stat ˼Ԥޤ" +msgstr "%s の状態を取得するのに失敗しました" #: ftparchive/writer.cc:386 msgid "Archive had no package field" -msgstr "֤˥ѥåեɤޤǤ" +msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" -msgstr " %s override ȥ꤬ޤ\n" +msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %1$s ƥʤ %3$s ǤϤʤ %2$s Ǥ\n" +msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "顼 %s Ǥޤ" +msgstr "内部エラー、メンバー %s を特定できません" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - γƤ˼Ԥޤ" +msgstr "realloc - メモリの割り当てに失敗しました" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" -msgstr "'%s' ץǤޤ" +msgstr "'%s' をオープンできません" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" -msgstr " override %s %lu #1" +msgstr "不正な override %s %lu 行目 #1" #: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" -msgstr " override %s %lu #2" +msgstr "不正な override %s %lu 行目 #2" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr " override %s %lu #3" +msgstr "不正な override %s %lu 行目 #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "override ե %s ɤ߹Τ˼Ԥޤ" +msgstr "override ファイル %s を読み込むのに失敗しました" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "'%s' ̤Τΰ̥르ꥺǤ" +msgstr "'%s' は未知の圧縮アルゴリズムです" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "̽ %s ˤϰ̥åȤɬפǤ" +msgstr "圧縮出力 %s には圧縮セットが必要です" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "ҥץؤ IPC ѥפκ˼Ԥޤ" +msgstr "子プロセスへの IPC パイプの作成に失敗しました" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "FILE* κ˼Ԥޤ" +msgstr "FILE* の作成に失敗しました" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "fork ˼Ԥޤ" +msgstr "fork に失敗しました" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "̻ҥץ" +msgstr "圧縮子プロセス" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "顼%s κ˼Ԥޤ" +msgstr "内部エラー、%s の作成に失敗しました" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "ҥץ IPC ˼Ԥޤ" +msgstr "子プロセス IPC の生成に失敗しました" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "ʲΰ̥ġμ¹Ԥ˼Ԥޤ: " +msgstr "以下の圧縮ツールの実行に失敗しました: " #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "Ÿġ" +msgstr "展開ツール" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "ҥץ/եؤ IO Ԥޤ" +msgstr "子プロセス/ファイルへの IO が失敗しました" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "MD5 ηɤ߹ߤ˼Ԥޤ" +msgstr "MD5 の計算中に読み込みに失敗しました" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "%s unlink ꤬ȯޤ" +msgstr "%s のリンク解除で問題が発生しました" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "%s %s ˥͡ǤޤǤ" +msgstr "%s を %s に名前変更できませんでした" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" -msgstr "ɽŸ顼 - %s" +msgstr "正規表現の展開エラー - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" -msgstr "ʲΥѥåˤʤ¸طޤ:" +msgstr "以下のパッケージには満たせない依存関係があります:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" -msgstr "%s ϥȡ뤵Ƥޤ" +msgstr "しかし、%s はインストールされています" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" -msgstr "%s ϥȡ뤵褦ȤƤޤ" +msgstr "しかし、%s はインストールされようとしています" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" -msgstr "ȡ뤹뤳ȤǤޤ" +msgstr "しかし、インストールすることができません" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" -msgstr "ϲۥѥåǤ" +msgstr "しかし、これは仮想パッケージです" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" -msgstr "ȡ뤵Ƥޤ" +msgstr "しかし、インストールされていません" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" -msgstr "ȡ뤵褦ȤƤޤ" +msgstr "しかし、インストールされようとしていません" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" -msgstr " ޤ" +msgstr " または" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "ʲΥѥå˥ȡ뤵ޤ:" +msgstr "以下のパッケージが新たにインストールされます:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "ʲΥѥåϡֺפޤ:" +msgstr "以下のパッケージは「削除」されます:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "ʲΥѥåαޤ:" +msgstr "以下のパッケージは保留されます:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "ʲΥѥåϥåץ졼ɤޤ:" +msgstr "以下のパッケージはアップグレードされます:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "ʲΥѥåϡ֥졼ɡפޤ:" +msgstr "以下のパッケージは「ダウングレード」されます:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "ʲѹػߥѥåѹޤ:" +msgstr "以下の変更禁止パッケージは変更されます:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " -msgstr "%s (%s Τ) " +msgstr "%s (%s のため) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ٹ: ʲԲķѥåޤ\n" -"褦ȤƤ뤫Ȥ狼ʤϡ¹ԤƤϤޤ!" +"警告: 以下の不可欠パッケージが削除されます。\n" +"何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "åץ졼: %lu ġȡ: %lu ġ" +msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "ƥȡ: %lu ġ" +msgstr "再インストール: %lu 個、" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " -msgstr "졼: %lu ġ" +msgstr "ダウングレード: %lu 個、" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr ": %lu ġα: %lu ġ\n" +msgstr "削除: %lu 個、保留: %lu 個。\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ĤΥѥå˥ȡޤϺƤޤ\n" +msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." -msgstr "¸ط褷Ƥޤ..." +msgstr "依存関係を解決しています ..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." -msgstr " Ԥޤ" +msgstr " 失敗しました。" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" -msgstr "¸طľȤǤޤ" +msgstr "依存関係を訂正できません" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "åץ졼ɥåȤǾǤޤ" +msgstr "アップグレードセットを最小化できません" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" -msgstr " λ" +msgstr " 完了" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -"ľˤ 'apt-get -f install' ¹Ԥɬפ뤫⤷ޤ" -"" +"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" +"ん。" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." -msgstr "̤ΰ¸طޤ-f ץƤ" +msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ٹ: ʲΥѥåǧڤƤޤ!" +msgstr "警告: 以下のパッケージは認証されていません!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "認証の警告は上書きされました。\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "ڤʤˤΥѥåȡ뤷ޤ [y/N]? " +msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "ĤΥѥåǧڤޤǤ" +msgstr "いくつかのパッケージを認証できませんでした" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" -msgstr "꤬ȯ-y ץ --force-yes ʤǻѤޤ" +msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "ѥåʤФʤޤ̵ˤʤäƤޤ" +msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "顼diversion ɲ" +msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" -msgstr "ɥǥ쥯ȥåǤޤ" +msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "ΥꥹȤɤळȤǤޤ" +msgstr "ソースのリストを読むことができません。" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "%2$sB %1$sB Υ֤ɬפޤ\n" +msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "%sB Υ֤ɬפޤ\n" +msgstr "%sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Ÿɲä %sB Υǥ̤ޤ\n" +msgstr "展開後に追加で %sB のディスク容量が消費されます。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Ÿ %sB Υǥ̤ޤ\n" +msgstr "展開後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "%s ˽ʬʶڡޤ" +msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "%s ˽ʬʶڡޤ" +msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Trivial Only ꤵޤϴñǤϤޤ" +msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"ǽΤ뤳Ȥ褦ȤƤޤ\n" -"³Ԥˤϡ'%s' Ȥե졼פƤ\n" +"重大な問題を引き起こす可能性のあることをしようとしています。\n" +"続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." -msgstr "Ǥޤ" +msgstr "中断しました。" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " -msgstr "³Ԥޤ [Y/n]? " +msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "%s μ˼Ԥޤ %s\n" +msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" -msgstr "ĤΥեμ˼Ԥޤ" +msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" -msgstr "ɥ⡼ɤǥѥåΥɤλޤ" +msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"ĤΥ֤Ǥޤapt-get update ¹Ԥ뤫 --fix-" -"missing ץդƻƤߤƤ" +"いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-" +"missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing ȥǥϸƱˤϥݡȤƤޤ" +msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." -msgstr "ʤѥåľȤǤޤ" +msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." -msgstr "ȡǤޤ" +msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "ա%2$s %1$s ޤ\n" +msgstr "注意、%2$s の代わりに %1$s を選択します\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"˥ȡ뤵Ƥꥢåץ졼ɤꤵƤʤᡢ%s å" -"ޤ\n" +"すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" +"プします。\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "ѥå %s ϥȡ뤵ƤʤᡢϤǤޤ\n" +msgstr "パッケージ %s はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "%s ϰʲΥѥåƤ벾ۥѥåǤ:\n" +msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" -msgstr " [ȡѤ]" +msgstr " [インストール済み]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "ȡ뤹ѥåŪɬפޤ" +msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"ѥå %s ϥǡ١ˤ¸ߤޤѤǤޤ\n" -"餯ΥѥåĤʤ⤦ŤʤäƤ뤫\n" -"뤤̤ΥΤߤѤǤʤȤͤޤ\n" +"パッケージ %s はデータベースには存在しますが、利用できません。\n" +"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" +"あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "ʲΥѥå֤Ƥޤ:" +msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "ѥå %s ˤϥȡ䤬ޤ" +msgstr "パッケージ %s にはインストール候補がありません" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "ɤǤʤᡢ%s κƥȡԲǽǤ\n" +msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s ϴ˺ǿСǤ\n" +msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "'%2$s' Υ '%1$s' ĤޤǤ" +msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "'%2$s' ΥС '%1$s' ĤޤǤ" +msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "%3$s ˤϥС %1$s (%2$s) ޤ\n" +msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" -msgstr "update ޥɤϰޤ" +msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" -msgstr "list ǥ쥯ȥå뤳ȤǤޤ" +msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"ĤΥǥåեΥɤ˼Ԥޤ̵뤵줿" -"뤤ϸŤΤѤޤ" +"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" +"るか、古いものが代わりに使われます。" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" -msgstr "顼AllUpgrade ˲ޤ" +msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" -msgstr "ѥå %s դޤ" +msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr ": ɽ '%2$s' Ф %1$s ޤ\n" +msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -"ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷" -"ޤ:" +"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" +"ません:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ" -"Ƥ)" +"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" +"を明示してください)。" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"ȡ뤹뤳ȤǤʤѥåޤ餯ꤨ\n" -"ʤᤷɬפʥѥåޤƤʤä \n" -"Incoming ưƤʤǥǥȥӥ塼Ѥ\n" -"ƤΤȹͤޤ" +"インストールすることができないパッケージがありました。おそらく、あり得\n" +"ない状況を要求したか、(不安定版ディストリビューションを使用しているの\n" +"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" +"動されていないことが考えられます。" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"ñԤäʤΤǡΥѥåñ˥ȡǤʤ\n" -"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n" -"" +"単純な操作を行っただけなので、このパッケージは単にインストールできない\n" +"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n" +"さい。" -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "ʲξ褹뤿ΩĤ⤷ޤ:" +msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" -msgstr "줿ѥå" +msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "ʲ̥ѥåȡ뤵ޤ:" +msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" -msgstr "ƥѥå:" +msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" -msgstr "侩ѥå:" +msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "åץ졼ɥѥåФƤޤ... " +msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "" +msgstr "失敗" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" -msgstr "λ" +msgstr "完了" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "顼AllUpgrade ˲ޤ" +msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" -"ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ" +"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" -msgstr "%s ΥѥåĤޤ" +msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" -msgstr "%s ˽ʬʶڡޤ" +msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "%2$sB %1$sB Υ֤ɬפޤ\n" +msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "%sB Υ֤ɬפޤ\n" +msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" -msgstr " %s \n" +msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." -msgstr "ĤΥ֤μ˼Ԥޤ" +msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Ǥ %s Ÿ줿뤿ᡢŸåפޤ\n" +msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Ÿޥ '%s' Ԥޤ\n" +msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" +"'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" -msgstr "ӥɥޥ '%s' Ԥޤ\n" +msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" -msgstr "ҥץԤޤ" +msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" -"builddeps åѥåʤȤ 1 Ļꤹɬפޤ" +"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "%s build-dependency 뤳ȤǤޤ" +msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" -msgstr "%s ˤ build depends ꤵƤޤ\n" +msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط" -"Ǥޤ" +"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" +"ができません" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"ǽ %3$s ϤСˤĤƤʤᡢ%2$s " -" %1$s ΰ¸طȤǤޤ" +"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" +"する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"%2$s ΰ¸ط %1$s ȤǤޤ: ȡ뤵줿 %3$s ѥ" -"Ͽޤ" +"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" +"ケージは新しすぎます" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s" +msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "%s Build-dependency ȤǤޤǤ" +msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" -msgstr "build dependency ν˼Ԥޤ" +msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" -msgstr "ݡȤƤ⥸塼:" +msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1225,73 +1241,73 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"ˡ: apt-get [ץ] ޥ\n" -" apt-get [ץ] install|remove ѥå̾1 [ѥå̾" +"使用法: apt-get [オプション] コマンド\n" +" apt-get [オプション] install|remove パッケージ名1 [パッケージ名" "2 ...]\n" -" apt-get [ץ] source ѥå̾1 [ѥå̾2 ...]\n" +" apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n" "\n" -"apt-get ϡѥå/ȡ뤹뤿δñʥ\n" -"ɥ饤եǤäȤ褯Ȥ륳ޥɤϡupdate \n" -" install Ǥ\n" +"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n" +"ンドラインインタフェースです。もっともよく使われるコマンドは、update \n" +"と install です。\n" "\n" -"ޥ:\n" -" update - ѥåꥹȤޤ\n" -" upgrade - åץ졼ɤԤޤ\n" -" install - ѥåȡ뤷ޤ\n" -" (pkg libc6.deb ǤϤʤ libc6 Τ褦˻ꤷޤ)\n" -" remove - ѥåޤ\n" -" source - ֤ɤޤ\n" -" build-dep - ѥåι۰¸طꤷޤ\n" -" dist-upgrade - ǥȥӥ塼åץ졼ɤޤ\n" -" (apt-get(8) )\n" -" dselect-upgrade - dselect ˤޤ\n" -" clean - ɤ֥եޤ\n" -" autoclean - ɤŤ֥եޤ\n" -" check - 줿¸طʤåޤ\n" +"コマンド:\n" +" update - パッケージリストを取得・更新します\n" +" upgrade - アップグレードを行います\n" +" install - 新規パッケージをインストールします\n" +" (pkg は libc6.deb ではなく libc6 のように指定します)\n" +" remove - パッケージを削除します\n" +" source - ソースアーカイブをダウンロードします\n" +" build-dep - ソースパッケージの構築依存関係を設定します\n" +" dist-upgrade - ディストリビューションをアップグレードします\n" +" (apt-get(8) を参照)\n" +" dselect-upgrade - dselect の選択に従います\n" +" clean - ダウンロードしたアーカイブファイルを削除します\n" +" autoclean - ダウンロードした古いアーカイブファイルを削除します\n" +" check - 壊れた依存関係がないかチェックします\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" -q ե˽ϲǽʷˤ - ץ쥹ɽʤ\n" -" -qq 顼ʳɽʤ\n" -" -d ɤΤ߹Ԥ - ֤ΥȡŸϹԤʤ\n" -" -s ºݤˤϼ¹Ԥʤ¹ԥߥ졼Τ߹Ԥ\n" -" -y Ƥ䤤碌 Yes ץץȤ֤ʤ\n" -" -f åǼԤƤ³Ԥ\n" -" -m ֤¸ߤʤ³Ԥ\n" -" -u åץ졼ɤѥåɽ\n" -" -b ѥåӥɤԤ\n" -" -V ĹʥСʥФɽ\n" -" -c=? ꤷեɤ߹\n" -" -o=? Ǥդꥪץꤹ, -o dir::cache=/tmp\n" -"ץ˴ؤƤϡޥ˥奢ڡ apt-get(8)sources.list(5)\n" -"apt.conf(5) ȤƤ\n" -" APT Super Cow Powers Ƥޤ\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -q ログファイルに出力可能な形式にする - プログレス表示をしない\n" +" -qq エラー以外は表示しない\n" +" -d ダウンロードのみ行う - アーカイブのインストールや展開は行わない\n" +" -s 実際には実行しない。実行シミュレーションのみ行う\n" +" -y すべての問い合わせに Yes で答え、プロンプトは返さない\n" +" -f 整合性チェックで失敗しても処理を続行する\n" +" -m アーカイブが存在しない場合も続行する\n" +" -u アップグレードされるパッケージも表示する\n" +" -b ソースパッケージを取得し、ビルドを行う\n" +" -V 冗長なバージョンナンバを表示する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 任意の設定オプションを指定する, 例 -o dir::cache=/tmp\n" +"オプション・設定に関しては、マニュアルページ apt-get(8)、sources.list(5)、\n" +"apt.conf(5) を参照してください。\n" +" この APT は Super Cow Powers 化されています。\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "ҥå " +msgstr "ヒット " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr ":" +msgstr "取得:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "̵ " +msgstr "無視 " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "顼 " +msgstr "エラー " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB %s Ǽޤ (%sB/s)\n" +msgstr "%sB を %s で取得しました (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " []" +msgstr " [処理中]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1300,13 +1316,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"ǥѹ: \n" +"メディア変更: \n" " '%s'\n" -"ȥ٥դǥɥ饤 '%s' enter Ƥ\n" +"とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "ʥѥå쥳ɤǤ!" +msgstr "不明なパッケージレコードです!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1321,227 +1337,228 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"ˡ: apt-sortpkgs [ץ] ե̾1 [ե̾2 ...]\n" +"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n" "\n" -"apt-sortpkgs ϥѥåեȤ뤿δñʥġǤ\n" -"-s ץϥեμ˻Ѥޤ\n" +"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n" +"-s オプションはファイルの種類を示すために使用されます。\n" "\n" -"ץ:\n" -" -h Υإפɽ\n" -" -s ե륽ȤѤ\n" -" -c=? ꤷեɤߤ\n" -" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -s ソースファイルソートを使用する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "ǥեȤ꤬褯ޤ!" +msgstr "不正なデフォルト設定です!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 msgid "Press enter to continue." -msgstr "enter ³Ԥޤ" +msgstr "enter を押すと続行します。" #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Ÿ˥顼ȯޤȡ뤵줿ѥå" +msgstr "展開中にエラーが発生しました。インストールされたパッケージを" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "ꤷޤˤꡢ顼ʣФ뤫¸طηǡ" +msgstr "設定します。これにより、エラーが複数出るか、依存関係の欠如に" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "륨顼Ф뤫⤷ޤˤϤʤ嵭Υå" +msgstr "よるエラーが出るかもしれません。これには問題はなく、上記のメッセージ" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "פǤ [I]nstall ټ¹ԤƤ" +msgstr "が重要です。これを修正して「導入」を再度実行してください" #: dselect/update:30 msgid "Merging available information" -msgstr "ǽޡƤޤ" +msgstr "入手可能情報をマージしています" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "ѥפ˼Ԥޤ" +msgstr "パイプの生成に失敗しました" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "gzip μ¹Ԥ˼Ԥޤ" +msgstr "gzip の実行に失敗しました" #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" -msgstr "줿" +msgstr "壊れたアーカイブ" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "tar åबԤޤ֤Ƥޤ" +msgstr "tar チェックサムが失敗しました。アーカイブが壊れています" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "̤Τ TAR إå %u %s" +msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "ʥֽ̾" +msgstr "不正なアーカイブ署名" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "֥Хإåɤ߹ߤ˼Ԥޤ" +msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "ʥ֥Хإå" +msgstr "不正なアーカイブメンバーヘッダ" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" -msgstr "֤Ƥޤ" +msgstr "アーカイブが不足しています" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "֥إåɤ߹ߤ˼Ԥޤ" +msgstr "アーカイブヘッダの読み込みに失敗しました" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "ƤΡɤ DropNode ƤФޤ" +msgstr "リンクされているノードで DropNode が呼ばれました" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "ϥåǤꤹ뤳ȤǤޤ!" +msgstr "ハッシュ要素を特定することができません!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "diversion γƤ˼Ԥޤ" +msgstr "diversion の割り当てに失敗しました" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "AddDiversion Ǥ顼" +msgstr "AddDiversion での内部エラー" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "%s -> %s %s/%s diversion 褦ȤƤޤ" +msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "%s -> %s diversion ŤɲäƤޤ" +msgstr "%s -> %s の diversion が二重に追加されています" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "ե %s/%s ʣƤޤ" +msgstr "設定ファイル %s/%s が重複しています" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "%s νߤ˼Ԥޤ" +msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" -msgstr "%s Υ˼Ԥޤ" +msgstr "%s のクローズに失敗しました" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" -msgstr "ѥ %s Ĺޤ" +msgstr "パス %s は長すぎます" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "%s ʣŸƤޤ" +msgstr "%s を複数回展開しています" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "ǥ쥯ȥ %s divert Ƥޤ" +msgstr "ディレクトリ %s は divert されています" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -"Υѥå diversion ΥåȤ %s/%s ˽⤦ȤƤޤ" +"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" -msgstr "diversion ѥĹޤ" +msgstr "diversion パスが長すぎます" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "ǥ쥯ȥ %s ǥ쥯ȥִ褦ȤƤޤ" +msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "ϥåХǥΡɤꤹΤ˼Ԥޤ" +msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "ѥĹޤ" +msgstr "パスが長すぎます" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "%s ФСΤʤѥåޥåޤ" +msgstr "%s に対するバージョンのないパッケージマッチを上書きします" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "ե %s/%s ѥå %s ΤΤޤ" +msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" -msgstr "%s ɤ߹ळȤǤޤ" +msgstr "%s を読み込むことができません" #: apt-inst/extract.cc:494 #, c-format msgid "Unable to stat %s" -msgstr "%s stat Ǥޤ" +msgstr "%s の状態を取得できません" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "%s κ˼Ԥޤ" +msgstr "%s の削除に失敗しました" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" -msgstr "%s Ǥޤ" +msgstr "%s を作成できません" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "%sinfo stat ˼Ԥޤ" +msgstr "%sinfo の状態の取得に失敗しました" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "info temp ǥ쥯ȥƱե륷ƥˤʤФʤޤ" +msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 msgid "Reading package lists" -msgstr "ѥåꥹȤɤߤǤޤ" +msgstr "パッケージリストを読み込んでいます" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "ǥ쥯ȥ %sinfo ؤΰư˼Ԥޤ" +msgstr "管理ディレクトリ %sinfo への移動に失敗しました" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "ѥå̾顼" +msgstr "パッケージ名取得中の内部エラー" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" -msgstr "եꥹȤɤ߹Ǥޤ" +msgstr "ファイルリストを読み込んでいます" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1550,284 +1567,280 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"ꥹȥե '%sinfo/%s' Υץ˼ԤޤΥե᤹" -"ȤǤʤʤ顢Ƥˤ¨¤ƱСΥѥåƥ" -"ȡ뤷Ƥ!" +"リストファイル '%sinfo/%s' のオープンに失敗しました。このファイルを元に戻すこ" +"とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン" +"ストールしてください!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "ꥹȥե %sinfo/%s ɤ߹ߤ˼Ԥޤ" +msgstr "リストファイル %sinfo/%s の読み込みに失敗しました" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "顼Ρɤμ" +msgstr "内部エラー、ノードの取得" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "diversions ե %sdiversions Υץ˼Ԥޤ" +msgstr "diversions ファイル %sdiversions のオープンに失敗しました" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "diversion ե뤬Ƥޤ" +msgstr "diversion ファイルが壊れています" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "diversion եʹԤޤ: %s" +msgstr "diversion ファイルに不正な行があります: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "顼diversion ɲ" +msgstr "内部エラー、diversion の追加" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "ǽ˥ѥååʤФʤޤ" - -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "եꥹȤɤߤǤޤ" +msgstr "最初にパッケージキャッシュを初期化しなければなりません" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Package: إåĤΤ˼Ԥޤեå %lu" +msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "status ե ConfFile ޤեå %lu" +msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "MD5 βϥ顼եå %lu" +msgstr "MD5 の解析エラー。オフセット %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "'%s' Фʤᡢ DEB ֤ǤϤޤ" +msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -"'%s' ޤ '%s' Фʤᡢ DEB ֤ǤϤޤ" +"'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ" +"ん" #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" -msgstr "%s ѹǤޤǤ" +msgstr "%s に変更できませんでした" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "顼ФǤޤ" +msgstr "内部エラー、メンバーを特定できません" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "եǤޤǤ" +msgstr "正しいコントロールファイルを特定できませんでした" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "ϤǤʤե" +msgstr "解析できないコントロールファイル" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "cdrom ǡ١ %s ɤߤळȤǤޤ" +msgstr "CD-ROM データベース %s を読み込むことができません" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -" CD APT ǧˤ apt-cdrom ѤƤ CD " -"ä뤿 apt-get update ϻѤǤޤ" +"この CD-ROM を APT に認識させるには apt-cdrom を使用してください。新しい CD-" +"ROM を追加するために apt-get update は使用できません。" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "CD 㤤ޤ" +msgstr "CD が違います" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "%s CD-ROM ϻΤᥢޥȤ뤳ȤǤޤ" +msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。" #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "ե뤬ߤĤޤ" +msgstr "ディスクが見つかりません。" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "ե뤬ߤĤޤ" +msgstr "ファイルが見つかりません" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" -msgstr "stat ˼Ԥޤ" +msgstr "状態の取得に失敗しました" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "ѹ˼Ԥޤ" +msgstr "変更時刻の設定に失敗しました" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr " URI Ǥ URI // ǻϤޤäƤϤޤ" +msgstr "不正な URI です。ローカルの URI は // で始まってはいけません" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Ƥޤ" +msgstr "ログインしています" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "ԥ͡ꤹ뤳ȤǤޤ" +msgstr "ピアネームを決定することができません" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "͡ꤹ뤳ȤǤޤ" +msgstr "ローカルネームを決定することができません" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Ф³䤵ޤ: %s" +msgstr "サーバから接続を拒絶されました。応答: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER ԡб: %s" +msgstr "USER 失敗、サーバ応答: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS ԡб: %s" +msgstr "PASS 失敗、サーバ応答: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"ץФꤵƤޤץȤꤵƤޤ" -"Acquire::ftp::ProxyLogin Ǥ" +"プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。" +"Acquire::ftp::ProxyLogin が空です。" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "ץȤΥޥ '%s' ԡб: %s" +msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE ԡб: %s" +msgstr "TYPE 失敗、サーバ応答: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "³ॢ" +msgstr "接続タイムアウト" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Ф³Ǥޤ" +msgstr "サーバが接続を切断しました" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" -msgstr "ɤ߹ߥ顼" +msgstr "読み込みエラー" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "쥹ݥХåեХեޤ" +msgstr "レスポンスがバッファをオーバフローさせました。" #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "ץȥ뤬Ƥޤ" +msgstr "プロトコルが壊れています" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" -msgstr "ߥ顼" +msgstr "書き込みエラー" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "åȤǤޤ" +msgstr "ソケットを作成できません" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "ǡåȤ³ǤޤǤ³ॢȤޤ" +msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "ưåȤ³Ǥޤ" +msgstr "パッシブソケットに接続できません。" #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo ϥꥹ˥ݡȤ뤳ȤǤޤǤ" +msgstr "getaddrinfo はリスニングポートを取得することができませんでした" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "åȤ bind ǤޤǤ" +msgstr "ソケットをバインドできませんでした" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "åȤ listen ǤޤǤ" +msgstr "ソケットをリスンできませんでした" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "åȤ̾ǤޤǤ" +msgstr "ソケットの名前を特定できませんでした" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "PORT ޥɤǤޤ" +msgstr "PORT コマンドを送信できません" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "̤ΤΥɥ쥹եߥ %u (AF_*)" +msgstr "未知のアドレスファミリ %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT ˼Ԥޤб: %s" +msgstr "EPRT に失敗しました。サーバ応答: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "ǡå³ॢ" +msgstr "データソケット接続タイムアウト" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "³ accept Ǥޤ" +msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "եΥϥåǤ" +msgstr "ファイルのハッシュでの問題" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "ե뤬Ǥޤб '%s'" +msgstr "ファイルを取得できません。サーバ応答 '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "ǡåȥॢ" +msgstr "データソケットタイムアウト" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "ǡž˼Ԥޤб '%s'" +msgstr "データ転送に失敗しました。サーバ応答 '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "䤤碌" +msgstr "問い合わせ" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "¹ԤǤޤ" +msgstr "呼び出せません" #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "%s (%s) ³Ƥޤ" +msgstr "%s (%s) へ接続しています" #: methods/connect.cc:71 #, c-format @@ -1837,517 +1850,516 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "%s (f=%u t=%u p=%u) Ф륽åȤǤޤ" +msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "%s:%s (%s) ؤ³ϤǤޤ" +msgstr "%s:%s (%s) への接続を開始できません。" #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "%s:%s (%s) ³ǤޤǤ³ॢȤޤ" +msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "%s:%s (%s) ³ǤޤǤ" +msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "%s ³Ƥޤ" +msgstr "%s へ接続しています" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" -msgstr "'%s' ǤޤǤ" +msgstr "'%s' を解決できませんでした" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "'%s' Ū˲Ǥޤ" +msgstr "'%s' が一時的に解決できません" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "'%s:%s' (%i) β꤬ޤ" +msgstr "'%s:%s' (%i) の解決中に問題が起こりました" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "%s %s ³Ǥޤ:" +msgstr "%s %s へ接続できません:" + +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "'%s' を解決できませんでした" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "å %s ǤޤǤ" +msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " 署名の検証 (gnupg はインストールされていますか?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "ʲ̥ѥåȡ뤵ޤ:" +msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "" +msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" -msgstr "%s ФƥѥפޤǤ" +msgstr "%s に対してパイプを開けませんでした" #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" -msgstr "%s ץɤ߹ߥ顼" +msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" -msgstr "إåԵǤ" +msgstr "ヘッダの待機中です" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "%u ʸۤ 1 ԤΥإåޤ" +msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" -msgstr "ʥإåԤǤ" +msgstr "不正なヘッダ行です" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "http Фʥץ饤إåƤޤ" +msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "http Ф Content-Length إåƤޤ" +msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "http Ф Content-Range إåƤޤ" +msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" -msgstr "http ФΥݡȤƤޤ" +msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" -msgstr "եեޥåȤǤ" +msgstr "不明な日付フォーマットです" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" -msgstr "select ˼Ԥޤ" +msgstr "select に失敗しました" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" -msgstr "³ॢ" +msgstr "接続タイムアウト" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" -msgstr "ϥեؤνߤǥ顼ȯޤ" +msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" -msgstr "եؤνߤǥ顼ȯޤ" +msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" -msgstr "եؤνߤǥ顼ȯޤ" +msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" -msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ" +msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" -msgstr "Фɤ߹ߤ˼Ԥޤ" +msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" -msgstr "ʥإåǤ" +msgstr "不正なヘッダです" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" -msgstr "³" +msgstr "接続失敗" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" -msgstr "顼" +msgstr "内部エラー" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "Υե mmap Ǥޤ" +msgstr "空のファイルを mmap できません" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu ХȤ mmap ǤޤǤ" +msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" -msgstr "줿 %s Ĥޤ" +msgstr "選択された %s が見つかりません" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "ǤʤάǤ: '%c'" +msgstr "理解できない省略形式です: '%c'" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "ե %s ץǤޤǤ" +msgstr "設定ファイル %s をオープンできませんでした" #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" -msgstr "%d ܤĹޤ ( %d)" +msgstr "%d 行目が長すぎます (最大 %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "ʸˡ顼 %s:%u: ֥å̾ʤǻϤޤäƤޤ" +msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "ʸˡ顼 %s:%u: ʥǤ" +msgstr "文法エラー %s:%u: 不正なタグです" #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "ʸˡ顼 %s:%u: ͤθ;ʬʥߤäƤޤ" +msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "ʸˡ顼 %s:%u: ̿ϥȥåץ٥ǤΤ¹ԤǤޤ" +msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "ʸˡ顼 %s:%u: 롼ɤΥͥȤ¿ޤ" +msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "ʸˡ顼 %s:%u: 饤롼ɤƤޤ" +msgstr "文法エラー %s:%u: ここからインクルードされています" #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "ʸˡ顼 %s:%u: ̤б̿ '%s'" +msgstr "文法エラー %s:%u: 未対応の命令 '%s'" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "ʸˡ顼 %s:%u: եκǸ;פʥߤޤ" +msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" #: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... 顼!" +msgstr "%c%s... エラー!" #: apt-pkg/contrib/progress.cc:156 #, c-format msgid "%c%s... Done" -msgstr "%c%s... λ" +msgstr "%c%s... 完了" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "ޥɥ饤ץ '%c' [%s ] Ǥ" +msgstr "コマンドラインオプション '%c' [%s から] は不明です。" #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "ޥɥ饤ץ %s Ǥޤ" +msgstr "コマンドラインオプション %s を理解できません" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "ޥɥ饤ץ %s boolean ǤϤޤ" +msgstr "コマンドラインオプション %s は boolean ではありません" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "ץ %s ˤϰɬפǤ" +msgstr "オプション %s には引数が必要です。" #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "ץ %s: ܤˤ =<> ꤹɬפޤ" +msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。" #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "ץ %s ˤ '%s' ǤϤʤΰɬפǤ" +msgstr "オプション %s には '%s' ではなく整数の引数が必要です" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "ץ '%s' Ĺޤ" +msgstr "オプション '%s' は長すぎます" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "%s ᤹뤳ȤǤޤtrue false Ƥ" +msgstr "%s を解釈することができません。true か false を試してください。" #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr " %s" +msgstr "不正な操作 %s" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "ޥȥݥ %s stat Ǥޤ" +msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" -msgstr "%s ѹ뤳ȤǤޤ" +msgstr "%s へ変更することができません" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "cdrom stat ˼Ԥޤ" +msgstr "cdrom の状態を取得するのに失敗しました" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "ɤ߹ѤΥåե %s ˥åϻѤޤ" +msgstr "読み込み専用のロックファイル %s にロックは使用しません" #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "åե %s ץǤޤ" +msgstr "ロックファイル %s をオープンできません" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "nfs ޥȤ줿åե %s ˤϥåѤޤ" +msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" -msgstr "å %s ǤޤǤ" +msgstr "ロック %s が取得できませんでした" #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "%s ԤޤˤϤޤǤ" +msgstr "%s を待ちましたが、そこにはありませんでした" #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "ҥץ %s ơȿȤޤ" +msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "ҥץ %s 顼 (%u) ֤ޤ" +msgstr "子プロセス %s がエラーコード (%u) を返しました" #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "ҥץ %s ͽλޤ" +msgstr "子プロセス %s が予期せず終了しました" #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "ե %s ץǤޤǤ" +msgstr "ファイル %s をオープンできませんでした" #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" -msgstr "ɤ߹ߤ %lu ĤäƤϤǤĤäƤޤ" +msgstr "読み込みが %lu 残っているはずですが、何も残っていません" #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr " %lu ɬפޤळȤǤޤǤ" +msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "եΥ꤬ȯޤ" +msgstr "ファイルのクローズ中に問題が発生しました" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "եκ꤬ȯޤ" +msgstr "ファイルの削除中に問題が発生しました" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "ե sync ꤬ȯޤ" +msgstr "ファイルの同期中に問題が発生しました" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" -msgstr "Υѥåå" +msgstr "空のパッケージキャッシュ" #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "ѥååե뤬Ƥޤ" +msgstr "パッケージキャッシュファイルが壊れています" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "ΥѥååեϸߴʤСǤ" +msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" #: apt-pkg/pkgcache.cc:142 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr " APT ϥС˥ƥ '%s' ݡȤƤޤ" +msgstr "この APT はバージョニングシステム '%s' をサポートしていません" #: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" -msgstr "ѥåå夬ۤʤ륢ƥѤ˹ۤƤޤ" +msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" #: apt-pkg/pkgcache.cc:218 msgid "Depends" -msgstr "¸" +msgstr "依存" #: apt-pkg/pkgcache.cc:218 msgid "PreDepends" -msgstr "¸" +msgstr "先行依存" #: apt-pkg/pkgcache.cc:218 msgid "Suggests" -msgstr "" +msgstr "提案" #: apt-pkg/pkgcache.cc:219 msgid "Recommends" -msgstr "侩" +msgstr "推奨" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "" +msgstr "競合" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" -msgstr "ִ" +msgstr "置換" #: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" -msgstr "ѻ" +msgstr "廃止" #: apt-pkg/pkgcache.cc:231 msgid "important" -msgstr "" +msgstr "重要" #: apt-pkg/pkgcache.cc:231 msgid "required" -msgstr "" +msgstr "要求" #: apt-pkg/pkgcache.cc:231 msgid "standard" -msgstr "ɸ" +msgstr "標準" #: apt-pkg/pkgcache.cc:232 msgid "optional" -msgstr "Ǥ" +msgstr "任意" #: apt-pkg/pkgcache.cc:232 msgid "extra" -msgstr "" +msgstr "特別" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" -msgstr "¸طĥƤޤ" +msgstr "依存関係ツリーを作成しています" #: apt-pkg/depcache.cc:61 msgid "Candidate versions" -msgstr "С" +msgstr "候補バージョン" #: apt-pkg/depcache.cc:90 msgid "Dependency generation" -msgstr "¸ط" +msgstr "依存関係の生成" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "ѥåե %s ᤹뤳ȤǤޤ (1)" +msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "ѥåե %s ᤹뤳ȤǤޤ (2)" +msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "ꥹ %2$s %1$lu ܤǤ (URI)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "ꥹ %2$s %1$lu ܤǤ (dist)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "ꥹ %2$s %1$lu ܤǤ (URI parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "ꥹ %2$s %1$lu ܤǤ (absolute dist)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "ꥹ %2$s %1$lu ܤǤ (dist parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" -msgstr "%s ץƤޤ" +msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "ꥹ %2$s %1$u ܤĹޤ" +msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "ꥹ %2$s %1$u ܤǤ (type)" +msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "ꥹ %3$s %2$u Ԥˤ륿 '%1$s' Ǥ" +msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "ꥹ %2$s %1$u ܤǤ (vendor id)" +msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2356,235 +2368,245 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Υȡϡ/¸Υ롼פǡŪ˽פԲķѥ" -" %s ޤ¿ξ꤬븶Ȥʤޤ" -"Ԥʤ顢APT::Force-LoopBreak ץͭˤƤ" +"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ" +"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" +"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "ǥåեΥ '%s' ϥݡȤƤޤ" +msgstr "インデックスファイルのタイプ '%s' はサポートされていません" #: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"ѥå %s ƥȡ뤹ɬפޤΤΥ֤" -"Ĥ뤳ȤǤޤǤ" +"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" +"つけることができませんでした。" #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"顼pkgProblemResolver::Resolve ߤޤ餯ѹػߥѥå" -"Ǥ" +"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" +"ジが原因です。" #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "褹뤳ȤǤޤ줿ѹػߥѥåޤ" +msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." -msgstr "ꥹȥǥ쥯ȥ %spartial Ĥޤ" +msgstr "リストディレクトリ %spartial が見つかりません。" #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "֥ǥ쥯ȥ %spartial Ĥޤ" +msgstr "アーカイブディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "ファイルをダウンロードしています %li/%li (残り %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "ファイルリストを読み込んでいます" #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." -msgstr "åɥɥ饤 %s Ĥޤ" +msgstr "メソッドドライバ %s が見つかりません。" #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" -msgstr "å %s ˳ϤޤǤ" +msgstr "メソッド %s が正常に開始しませんでした" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"ǥѹ: \n" -" '%s'\n" -"ȥ٥դǥɥ饤 '%s' enter Ƥ\n" +"'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ" +"い。" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "ѥåƥ '%s' ϥݡȤƤޤ" +msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" -msgstr "ŬڤʥѥåƥॿפǤޤ" +msgstr "適切なパッケージシステムタイプを特定できません" #: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." -msgstr "%s stat Ǥޤ" +msgstr "%s の状態を取得できません。" #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "sources.list '' URI ꤹɬפޤ" +msgstr "sources.list に 'ソース' URI を指定する必要があります" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"ѥåꥹȤޤϥơեޤϥץ뤳ȤǤ" -"" +"パッケージリストまたはステータスファイルを解釈またはオープンすることができま" +"せん。" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" msgstr "" -"褹뤿ˤ apt-get update ¹Ԥɬפ뤫⤷" -"" +"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" +"せん" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" msgstr "" -"ʥ쥳ɤ preferences ե¸ߤޤѥåإåޤ" -"" +"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" +"ん" #: apt-pkg/policy.cc:291 #, c-format msgid "Did not understand pin type %s" -msgstr "pin %s ǤޤǤ" +msgstr "pin タイプ %s が理解できませんでした" #: apt-pkg/policy.cc:299 msgid "No priority (or zero) specified for pin" -msgstr "pin ͥ (ޤ 0) ꤵƤޤ" +msgstr "pin で優先度 (または 0) が指定されていません" #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" -msgstr "åߴʥС˥ƥबޤ" +msgstr "キャッシュに非互換なバージョニングシステムがあります" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "%s ˥顼ȯޤ (NewPackage)" +msgstr "%s を処理中にエラーが発生しました (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "%s ˥顼ȯޤ (UsePackage1)" +msgstr "%s を処理中にエラーが発生しました (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "%s ˥顼ȯޤ (UsePackage2)" +msgstr "%s を処理中にエラーが発生しました (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "%s ˥顼ȯޤ (NewFileVer1)" +msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "%s ˥顼ȯޤ (NewVersion1)" +msgstr "%s を処理中にエラーが発生しました (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "%s ˥顼ȯޤ (UsePackage3)" +msgstr "%s を処理中にエラーが発生しました (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "%s ˥顼ȯޤ (NewVersion2)" +msgstr "%s を処理中にエラーが発生しました (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr " APT бƤʾοΥѥåꤵޤ" +msgstr "この APT が対応している以上の数のパッケージが指定されました。" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr " APT бƤʾοΥСᤵޤ" +msgstr "この APT が対応している以上の数のバージョンが要求されました。" #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr " APT бƤʾοΰ¸طȯޤ" +msgstr "この APT が対応している以上の数の依存関係が発生しました。" #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "%s ˥顼ȯޤ (FindPkg)" +msgstr "%s を処理中にエラーが発生しました (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "%s ˥顼ȯޤ (CollectFileProvides)" +msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "ѥå %s %s ե¸ν˸ĤޤǤ" +msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" #: apt-pkg/pkgcachegen.cc:574 #, c-format msgid "Couldn't stat source package list %s" -msgstr "ѥåꥹ %s stat Ǥޤ" +msgstr "ソースパッケージリスト %s の状態を取得できません" #: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" -msgstr "եƤޤ" +msgstr "ファイル提供情報を収集しています" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "å¸ IO 顼ȯޤ" +msgstr "ソースキャッシュの保存中に IO エラーが発生しました" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "͡˼Ԥޤ%s (%s -> %s)" +msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" -msgstr "MD5Sum Ŭ礷ޤ" +msgstr "MD5Sum が適合しません" + +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:753 #, 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 Υեΰ֤Ǥޤ餯Υѥåư" -"ǽɬפޤ (¸ߤʤƥΤ)" +"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" +"で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"ѥå %s Υեΰ֤Ǥޤ餯Υѥåư" -"ǽɬפޤ" +"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" +"で修正する必要があります。" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"ѥåǥåե뤬Ƥޤѥå %s Filename: " -"եɤޤ" +"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " +"フィールドがありません。" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "Ŭ礷ޤ" +msgstr "サイズが適合しません" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "٥֥å %s ϥեץȤޤǤޤ" +msgstr "ベンダブロック %s はフィンガープリントを含んでいません" #: apt-pkg/cdrom.cc:507 #, c-format @@ -2592,50 +2614,50 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"CD-ROM ޥȥݥ %s Ѥޤ\n" -"CD-ROM ޥȤƤޤ\n" +"CD-ROM マウントポイント %s を使用します\n" +"CD-ROM をマウントしています\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "ǧƤޤ.. " +msgstr "確認しています.. " #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "Ǽ줿٥: %s \n" +msgstr "格納されたラベル: %s \n" #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "CD-ROM ޥȥݥ %s Ѥޤ\n" +msgstr "CD-ROM マウントポイント %s を使用します\n" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM ޥȤƤޤ\n" +msgstr "CD-ROM をアンマウントしています\n" #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" -msgstr "ǥԤäƤޤ...\n" +msgstr "ディスクを待っています ...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM ޥȤƤޤ...\n" +msgstr "CD-ROM をマウントしています ...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "ǥΥǥåեƤޤ..\n" +msgstr "ディスクのインデックスファイルを走査しています ..\n" #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -"%i Υѥåǥå%i Υǥå%i ν̾Ĥޤ" -"\n" +"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" +"た\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "ͭ̾ǤϤޤƻԤƤ\n" +msgstr "これは有効な名前ではありません。再試行してください。\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2643,100 +2665,109 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"ΥǥϰʲΤ褦˸ƤФޤ: \n" +"このディスクは以下のように呼ばれます: \n" "'%s'\n" #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." -msgstr "ѥåꥹȤԡƤޤ..." +msgstr "パッケージリストをコピーしています ..." #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" -msgstr "ꥹȤǤޤ\n" +msgstr "新しいソースリストを書き込んでいます\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "ΥǥΥꥹȤΥȥ:\n" +msgstr "このディスクのソースリストのエントリ:\n" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "CD-ROM ޥȤƤޤ..." +msgstr "CD-ROM をアンマウントしています ..." #: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" -msgstr "%i 쥳ɤߤޤ\n" +msgstr "%i レコードを書き込みました。\n" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "%i 쥳ɤߤޤ%i ĤΥե뤬¸ߤޤ\n" +msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i 쥳ɤߤޤ%i ĤŬ礷ʤե뤬ޤ\n" +msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"%i 쥳ɤߤޤ%i ĤΥե뤬Ĥ餺%i ĤŬ礷ʤ" -"ե뤬ޤ\n" +"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" +"ファイルがあります。\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "%s ץƤޤ" +msgstr "%s を準備しています" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "%s ץƤޤ" +msgstr "%s を展開しています" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "ե %s ץǤޤǤ" +msgstr "%s の設定を準備しています" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "%s ³Ƥޤ" +msgstr "%s を設定しています" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " ȡ뤵ƤС: " +msgstr "%s をインストールしました" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "%s の削除を準備しています" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "%s ץƤޤ" +msgstr "%s を削除しています" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "侩" +msgstr "%s を削除しました" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "%s の設定を準備しています" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "%s の削除に失敗しました" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "³ޤ" +msgstr "途中で接続がクローズされました" + +#~ msgid "Reading file list" +#~ msgstr "ファイルリストを読み込んでいます" + +#~ msgid "Could not execute " +#~ msgstr "実行できませんでした:" + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "設定 %s の削除を準備しています" -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "ꥹ %3$s %2$u Ԥʥ٥ ID '%1$s' ޤ" +#~ msgid "Removed with config %s" +#~ msgstr "設定 %s を削除しました" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <cwryu@debian.org>\n" @@ -143,14 +143,14 @@ msgstr " 버전 테이블:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -224,6 +224,22 @@ msgstr "" " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" +"디스크를 넣고 enter를 누르십시오\n" +" '%1$s'\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "인수가 두 개가 아닙니다" @@ -501,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" @@ -510,12 +526,12 @@ msgstr "%s의 정보를 읽는 데 실패했습니다" msgid "Archive had no package field" msgstr "아카이브에 꾸러미 필드가 없습니다" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" @@ -615,79 +631,79 @@ msgstr "%s의 링크를 해제하는 데 문제가 있습니다" msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "다음 꾸러미의 의존성이 맞지 않습니다:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "하지만 %s 꾸러미를 설치했습니다" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 꾸러미를 설치할 것입니다" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "하지만 가상 꾸러미입니다" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " 혹은" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "다음 새 꾸러미를 설치할 것입니다:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "다음 꾸러미를 지울 것입니다:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "다음 꾸러미를 과거 버전으로 유지합니다:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "다음 꾸러미를 업그레이드할 것입니다:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "다음 꾸러미를 다운그레이드할 것입니다:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -696,148 +712,148 @@ msgstr "" "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " 실패." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 꾸러미가 있습니다" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "diversion을 추가하는 데 내부 오류" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -848,28 +864,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -877,48 +893,48 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "빠진 꾸러미를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "설치하려면 분명하게 하나를 선택해야 합니다." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -929,49 +945,49 @@ msgstr "" "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "하지만 다음 꾸러미가 대체합니다:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 꾸러미는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -979,26 +995,26 @@ msgstr "" "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" "전을 대신 사용합니다." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1006,7 +1022,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1017,7 +1033,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1026,115 +1042,120 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1143,7 +1164,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1152,32 +1173,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1430,7 +1451,7 @@ msgstr "%s/%s 설정 파일이 중복되었습니다" msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는 데 실패했습니다" @@ -1483,7 +1504,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@ -1529,7 +1551,7 @@ msgstr "관리 디렉토리를 %sinfo로 바꾸는 데 실패했습니다" msgid "Internal error getting a package name" msgstr "꾸러미 이름을 가져오는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "파일 목록을 읽는 중입니다" @@ -1575,10 +1597,6 @@ msgstr "diversion을 추가하는 데 내부 오류" msgid "The pkg cache must be initialized first" msgstr "꾸러미 캐시를 먼저 초기화해야 합니다" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "파일 목록을 읽는 중" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1652,12 +1670,12 @@ msgstr "파일이 없습니다" msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1785,7 +1803,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1808,7 +1826,7 @@ msgstr "데이터 전송 실패, 서버에서는: %s" msgid "Query" msgstr "질의" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " @@ -1837,71 +1855,71 @@ msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s에 연결할 수 없습니다:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "'%s'의 주소를 알아낼 수 없습니다" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "%s 잠금 파일을 얻을 수 없습니다" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1917,76 +1935,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다" msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "내부 오류" @@ -1999,7 +2017,7 @@ msgstr "빈 파일에 mmap할 수 없습니다" msgid "Couldn't make mmap of %lu bytes" msgstr "%lu바이트를 mmap할 수 없습니다" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" @@ -2120,7 +2138,7 @@ msgstr "잘못된 작업 %s" msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" @@ -2277,62 +2295,62 @@ msgstr "후보 버전" msgid "Dependency generation" msgstr "의존성 만들기" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" @@ -2382,11 +2400,18 @@ msgstr "목록 디렉토리 %spartial이 빠졌습니다." msgid "Archive directory %spartial is missing." msgstr "아카이브 디렉토리 %spartial이 빠졌습니다." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "파일 목록을 읽는 중입니다" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2405,12 +2430,12 @@ msgstr "" "디스크를 넣고 enter를 누르십시오\n" " '%1$s'\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" @@ -2528,11 +2553,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2541,7 +2570,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2550,14 +2579,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2701,15 +2730,22 @@ msgid "Removed %s" msgstr "추천" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "설정 파일 %s 파일을 여는 중입니다" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "%s을(를) 지우는 데 실패했습니다" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" + +#~ msgid "Reading file list" +#~ msgstr "파일 목록을 읽는 중" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "%s 잠금 파일을 얻을 수 없습니다" diff --git a/po/makefile b/po/makefile index bb8118c77..45e5b1e5a 100644 --- a/po/makefile +++ b/po/makefile @@ -66,7 +66,7 @@ binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) .PHONY: update-po update-po: $(PACKAGE)-all.pot - for lang in ${LINGUAS}; do\ + for lang in ${LINGUAS}; do \ echo "Updating $$lang.po"; \ $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \ cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \ @@ -74,7 +74,7 @@ update-po: $(PACKAGE)-all.pot done clean: clean/local -clean/local: +clean/local: update-po rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d # Include the dependencies that are available @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n" @@ -160,14 +160,14 @@ msgstr " Versjonstabell:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -242,6 +242,22 @@ msgstr "" " -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n" "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Bytte av media: sett inn CD-en som er merket\n" +" %s\n" +"i %s og trykk Enter\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Ikke parvise argumenter" @@ -519,7 +535,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke f statusen p %s" @@ -528,12 +544,12 @@ msgstr "Klarte ikke f statusen p %s" msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" @@ -633,79 +649,79 @@ msgstr "Problem ved oppheving av lenken til %s" msgid "Failed to rename %s to %s" msgstr "Klarte ikke endre navnet p %s til %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Flgende pakker har uinnfridde avhengighetsforhold:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "men er ikke installert" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Flgende NYE pakker vil bli installert:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Flgende pakker vil bli FJERNET:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Flgende pakker er holdt tilbake:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Flgende pakker vil bli oppgradert:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Flgende pakker vil bli NEDGRADERT:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Flgende pakker vil bli endret:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -714,145 +730,145 @@ msgstr "" "ADVARSEL: Flgende kjernepakker vil bli fjernet\n" "Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert p nytt, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu fjerne og %lu ikke oppgradert.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Retter p avhengighetsforhold ..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Klarer ikke rette p avhengighetsforholdene" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke minimere oppgraderingsettet" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Utfrt" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjre apt-get -f install for rette p dette." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prv -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og -y ble brukt uten --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Det oppsto en intern feil nr avledningen ble lagt til" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M hente %sB/%sB med arkiver.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M hente %sB med arkiver.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Bare trivielle endringer ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -863,28 +879,28 @@ msgstr "" "For fortsette, skriv: %s\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -892,48 +908,48 @@ msgstr "" "Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og bytte av media stttes n ikke" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Klarer ikke rette p manglende pakker." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Du m velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -944,49 +960,49 @@ msgstr "" "Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Flgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -994,25 +1010,25 @@ msgstr "" "Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1036,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1032,7 +1048,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,122 +1058,127 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, 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:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1166,32 +1187,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1446,7 +1467,7 @@ msgstr "Dobbel oppsettsfil %s/%s" msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke lukke fila %s" @@ -1499,7 +1520,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke lese %s" @@ -1546,7 +1568,7 @@ msgstr "Klarte ikke bytte til adminkatalogen %sinfo" msgid "Internal error getting a package name" msgstr "Intern feil ved henting av pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Les filliste" @@ -1593,10 +1615,6 @@ msgstr "Det oppsto en intern feil nr avledningen ble lagt til" msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m klargjres frst" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Leser filliste" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1673,12 +1691,12 @@ msgstr "Fant ikke fila" msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikke f status" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1806,7 +1824,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1829,7 +1847,7 @@ msgstr "Dataoverfringen mislykkes, tjeneren sa %s" msgid "Query" msgstr "Sprring" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Klarte ikke starte" @@ -1858,71 +1876,71 @@ msgstr "Klarte ikke starte forbindelsen til %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikke koble til %s:%s (%s), tidsavbrudd p forbindelsen" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikke koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke sl opp %s" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av %s" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikke koble til %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Klarte ikke sl opp %s" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Fr ikke lst %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Flgende ekstra pakker vil bli installert." -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1938,76 +1956,76 @@ msgstr "Klarte ikke pne rr for %s" msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Venter p hoder" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "delagt hodelinje" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Intern feil" @@ -2020,7 +2038,7 @@ msgstr "Kan ikke utfre mmap p en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" @@ -2141,7 +2159,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarer ikke fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke endre %s" @@ -2298,62 +2316,62 @@ msgstr "Versjons-kandidater" msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil p linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil p linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil p %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil p %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "pner %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil p %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" @@ -2403,11 +2421,18 @@ msgstr "Listemappa %spartial mangler." msgid "Archive directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Les filliste" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2426,12 +2451,12 @@ msgstr "" " %s\n" "i %s og trykk Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s stttes ikke" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@ -2551,11 +2576,15 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2564,7 +2593,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2573,13 +2602,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2723,18 +2752,25 @@ msgid "Removed %s" msgstr "Anbefaler" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "pner oppsettsfila %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Klarte ikke fjerne %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "Reading file list" +#~ msgstr "Leser filliste" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Fr ikke lst %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjent selger ID %s i linje %u i kildelista %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -146,14 +146,14 @@ msgstr " Versietabel:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,22 @@ msgstr "" "\n" "Zie de apt-cache(8) en apt.conf(5) handleidingen voor meer informatie.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Medium wisselen: Gelieve de schijf met label\n" +" '%s'\n" +"in het station '%s' te plaatsen en op 'enter' te drukken\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenten niet in paren" @@ -509,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Status opvragen van %s is mislukt" @@ -518,12 +534,12 @@ msgstr "Status opvragen van %s is mislukt" msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" @@ -623,79 +639,79 @@ msgstr "Probleem bij het ontlinken van %s" msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "maar %s is genstalleerd" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal genstalleerd worden" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "maar het is niet genstalleerd" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "maar het zal niet genstalleerd worden" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " of" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (wegens %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -704,145 +720,145 @@ msgstr "" "WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n" "Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten genstalleerd, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw genstalleerd, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Vereisten worden verbeterd..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet verbeteren" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Interne fout bij het toevoegen van een omleiding" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft niet voldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -853,28 +869,28 @@ msgstr "" "Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -882,49 +898,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Genstalleerd]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "U dient er n expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -935,50 +951,50 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -986,27 +1002,27 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1030,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1025,7 +1041,7 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1035,119 +1051,124 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1156,7 +1177,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,32 +1186,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, 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:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1454,7 +1475,7 @@ msgstr "Dubbel configuratiebestand %s/%s" msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -1507,7 +1528,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -1554,7 +1576,7 @@ msgstr "Verspringen naar de beheermap %sinfo is mislukt" msgid "Internal error getting a package name" msgstr "Interne fout bij het ophalen van de pakketnaam" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Bestandslijst worden ingelezen" @@ -1601,10 +1623,6 @@ msgstr "Interne fout bij het toevoegen van een omleiding" msgid "The pkg cache must be initialized first" msgstr "De pakketcache dient eerst genitialiseerd te zijn" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Bestandslijst wordt ingelezen" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1681,12 +1699,12 @@ msgstr "Bestand niet gevonden" msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Status opvragen is mislukt" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1814,7 +1832,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1837,7 +1855,7 @@ msgstr "Data transfer is mislukt, server zei: %s" msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -1866,71 +1884,71 @@ msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Kon '%s' niet vinden" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Kon vergrendeling %s niet verkrijgen" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1946,79 +1964,79 @@ msgstr "Kon geen pijp openen voor %s" msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Interne fout" @@ -2031,7 +2049,7 @@ msgstr "Kan een leeg bestand niet mmappen" msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" @@ -2156,7 +2174,7 @@ msgstr "Ongeldige operatie %s" msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@ -2316,62 +2334,62 @@ msgstr "Kandidaat-versies" msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' is onbekend op regel %u in bronlijst %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@ -2423,11 +2441,18 @@ msgstr "Lijstmap %spartial is afwezig." msgid "Archive directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Bestandslijst worden ingelezen" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2446,12 +2471,12 @@ msgstr "" " '%s'\n" "in het station '%s' te plaatsen en op 'enter' te drukken\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2575,11 +2600,15 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2588,7 +2617,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2597,7 +2626,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2605,7 +2634,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2751,18 +2780,25 @@ msgid "Removed %s" msgstr "Aanbevelingen" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Configuratiebestand %s wordt geopend" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Verwijderen van %s is mislukt" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" +#~ msgid "Reading file list" +#~ msgstr "Bestandslijst wordt ingelezen" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Kon vergrendeling %s niet verkrijgen" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -149,14 +149,14 @@ msgstr " Versjonstabell:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -230,6 +230,22 @@ msgstr "" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" "Du finn meir informasjon p manualsidene apt-cache(8) og apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Skifte av medum: Set inn plata merkt\n" +" %s\n" +"i stasjonen %s og trykk Enter.\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Ikkje parvise argument" @@ -503,7 +519,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" @@ -512,12 +528,12 @@ msgstr "Klarte ikkje f status til %s" msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" @@ -617,79 +633,79 @@ msgstr "Problem ved oppheving av lenkje til %s" msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "men er ikkje installert" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -698,146 +714,146 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Rettar p krav ..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta p krav" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M henta %sB/%sB med arkiv.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M henta %sB med arkiv.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -848,28 +864,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -877,49 +893,49 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Du m velja ein som skal installerast." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -930,49 +946,49 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n" "eller er berre tilgjengeleg fr ei anna kjelde\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Dei flgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -980,26 +996,26 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1007,7 +1023,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1019,7 +1035,7 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1029,122 +1045,127 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, 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:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1153,31 +1174,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1430,7 +1451,7 @@ msgstr "Dobbel oppsettsfil %s/%s" msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -1483,7 +1504,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -1530,7 +1552,7 @@ msgstr "Klarte ikkje byta til adminkatalogen %sinfo" msgid "Internal error getting a package name" msgstr "Intern feil ved henting av pakkenamn" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Les filliste" @@ -1577,10 +1599,6 @@ msgstr "Intern feil ved tilleggjing av avleiing" msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m frst klargjerast" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Les filliste" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1656,12 +1674,12 @@ msgstr "Fann ikkje fila" msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1789,7 +1807,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel" msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1812,7 +1830,7 @@ msgstr "Dataoverfringa mislukkast, tenaren sa %s" msgid "Query" msgstr "Sprjing" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Klarte ikkje starta " @@ -1841,71 +1859,71 @@ msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje sl opp %s" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av %s" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Klarte ikkje sl opp %s" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Klarte ikkje lsa %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1921,76 +1939,76 @@ msgstr "Klarte ikkje opna ryr for %s" msgid "Read error from %s process" msgstr "Lesefeil fr %s-prosessen" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Intern feil" @@ -2003,7 +2021,7 @@ msgstr "Kan ikkje utfra mmap p ei tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" @@ -2124,7 +2142,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje f status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@ -2281,62 +2299,62 @@ msgstr "Kandidatversjonar" msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@ -2387,11 +2405,18 @@ msgstr "Listekatalogen %spartial manglar." msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Les filliste" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2410,12 +2435,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s er ikkje sttta" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@ -2534,11 +2559,15 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2547,7 +2576,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2555,14 +2584,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Feil storleik" @@ -2706,18 +2735,25 @@ msgid "Removed %s" msgstr "Tilrdingar" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Opnar oppsettsfila %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Klarte ikkje fjerna %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#~ msgid "Reading file list" +#~ msgstr "Les filliste" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Klarte ikkje lsa %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjend utgjevar-ID %s i linja %u i kjeldelista %s" @@ -1,13 +1,13 @@ # Advanced Package Transfer - APT message translation catalog # Polish translation by: # Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004. -# Bartosz Fenski <fenio@debian.org>, 2005 +# Bartosz Fenski <fenio@debian.org>, 2005, 2006 msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-11 11:47+0100\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski <fenio@debian.org>\n" "Language-Team: Polish <pddp@debian.linux.org.pl>\n" "MIME-Version: 1.0\n" @@ -147,14 +147,14 @@ msgstr " Tabela wersji:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -230,6 +230,18 @@ msgstr "" "Wicej informacji mona znale na stronach podrcznika apt-cache(8)\n" "oraz apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Prosz wprowadzi nazw dla tej pyty, np 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Prosz woy dysk do napdu i nacisn enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Powtrz ten proces dla reszty pyt." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nie s w parach" @@ -322,10 +334,9 @@ msgstr "Bd przy zapisywaniu nagwka do pliku zawartoci" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "Bd przy przetwarzaniu zawartoci %s" +msgstr "Bd podczas przetwarzania zawartoci %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -506,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Osignito ograniczenie odczania %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Nie udao si wykona operacji stat na %s" @@ -515,12 +526,12 @@ msgstr "Nie udao si wykona operacji stat na %s" msgid "Archive had no package field" msgstr "Archiwum nie posiadao pola pakietu" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" @@ -620,257 +631,255 @@ msgstr "Problem przy usuwaniu %s" msgid "Failed to rename %s to %s" msgstr "Nie udao si zmieni nazwy %s na %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Bd kompilacji wyraenia regularnego - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Nastpujce pakiety maj niespenione zalenoci:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zosta zainstalowany" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ale nie da si go zainstalowa" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " lub" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Zostan zainstalowane nastpujce NOWE pakiety:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Nastpujce pakiety zostan USUNITE:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Nastpujce pakiety zostay zatrzymane:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Nastpujce pakiety zostan zaktualizowane:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Zostan zainstalowane STARE wersje nastpujcych pakietw:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Zostan zmienione nastpujce zatrzymane pakiety:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"UWAGA: Zostan usunite nastpujce istotne pakiety\n" +"UWAGA: Zostan usunite nastpujce istotne pakiety.\n" "Nie powinno si tego robi, chyba e dokadnie wiesz, co robisz!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu przeinstalowywanych, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu cofnitych wersji, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w peni zainstalowanych lub usunitych.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Naprawianie zalenoci..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " nie udao si." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Nie udao si naprawi zalenoci" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Nie udao si zminimalizowa zbioru aktualizacji" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Naley uruchomi `apt-get -f install', aby je naprawi." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Niespenione zalenoci. Sprbuj uy -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Ostrzeenie uwierzytelniania zignorowano.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowa te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Niektre pakiety nie mogy zosta zweryfikowane" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Byy problemy, a uyto -y bez --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Bd wewntrzny, InstallPackages uyto z zepsutymi pakietami!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Bd wewntrzny przy dodawaniu objazdu" +msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Dziwne.. rozmiary si nie zgadzaj, zgo pod apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiww.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" +msgstr "Nie udao si ustali iloci wolnego miejsca w %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczajcej iloci wolnego miejsca." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywa tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Zaraz zrobisz co potencjalnie szkodliwego\n" +"Zaraz zrobisz co potencjalnie szkodliwego.\n" "Aby kontynuowa wpisz zdanie '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -878,48 +887,48 @@ msgstr "" "Nie udao si pobra niektrych archiww, sprbuj uruchomi apt-get update " "lub uy opcji --fix-missing" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie nonikw nie jest obecnie obsugiwane" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Nie udao si poprawi brakujcych pakietw." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju zainstalowane, a nie zostao wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wic nie zostanie usunity.\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Naley jednoznacznie wybra jeden z nich do instalacji." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -930,50 +939,50 @@ msgstr "" "Zazwyczaj oznacza to, e pakietu brakuje, zosta zastpiony przez inny\n" "pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Jednak nastpujce pakiety go zastpuj:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest moliwe, nie moe on zosta pobrany.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zostao znalezione" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersj %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -981,25 +990,25 @@ msgstr "" "Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " "zostaa uyta ich starsza wersja." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1007,7 +1016,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1015,134 +1024,138 @@ msgid "" "or been moved out of Incoming." msgstr "" "Nie udao si zainstalowa niektrych pakietw. Moe to oznacza,\n" -"e zadae/a niemoliwej sytuacji lub uywasz dystrybucji\n" -"niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n" -"lub przeniesione z katalogu Incoming (\"Przychodzce\")." +"e zadano niemoliwej sytuacji lub uywasz dystrybucji niestabilnej,\n" +"w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n" +"z katalogu Incoming (\"Przychodzce\")." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Poniewa zadae/a tylko jednej operacji, jest bardzo prawdopodobne, e\n" +"Poniewa zadno tylko jednej operacji, jest bardzo prawdopodobne, e\n" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie udao si" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" +msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Pomijanie ju pobranego pliku '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1151,7 +1164,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1160,32 +1173,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1438,11 +1451,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Nie udao si zapisa pliku %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Nie udao si zamkn pliku %s" @@ -1495,7 +1508,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nie mona czyta %s" @@ -1541,7 +1555,7 @@ msgstr "Nie udao si przej do katalogu administracyjnego %sinfo" msgid "Internal error getting a package name" msgstr "Bd wewntrzny podczas pobierania nazwy pakietu" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Czytanie listy plikw" @@ -1588,10 +1602,6 @@ msgstr "Bd wewntrzny przy dodawaniu objazdu" msgid "The pkg cache must be initialized first" msgstr "Magazyn podrczny pakietw musi wczeniej zosta zainicjalizowany" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Czytanie listy plikw" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1657,20 +1667,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nie udao si odmontowa CD-ROM-u w %s, by moe wci jest uywany." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Nie odnaleziono pliku" +msgstr "Nie odnaleziono dysku." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nie udao si wykona operacji stat" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nie udao si ustawi czasu modyfikacji" @@ -1799,7 +1808,7 @@ msgstr "Przekroczony czas poczenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1822,7 +1831,7 @@ msgstr "Nie udao si przesa danych, serwer powiedzia '%s'" msgid "Query" msgstr "Info" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nie mona wywoa " @@ -1851,75 +1860,78 @@ msgstr "Nie udao si zainicjalizowa poczenia z %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nie udao si poczy z %s:%s (%s), przekroczenie czasu poczenia" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nie udao si poczy z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "czenie z %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nie udao si przetumaczy nazwy '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy bd przy tumaczeniu '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Co niegodziwego stao si przy tumaczeniu '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nie udao si poczy z %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nie udao si przetumaczy nazwy '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Lista argumentw Acquire::gpgv::Options zbyt duga. Wychodzimy." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Bd wewntrzny: Prawidowa sygnatura, ale nie nie udao si ustali " +"jejodcisku?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Napotkano przynajmniej jedn nieprawidow sygnatur." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Nie udao si uzyska blokady %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " by zweryfikowa sygnatur (czy gnupg jest zainstalowane?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Nieznany bd podczas uruchamiania gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" +msgstr "Nastpujce sygnatury byy bdne:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Nastpujce sygnatury nie mogy zosta zweryfikowane z powodu braku klucza " +"publicznego:\n" #: methods/gzip.cc:57 #, c-format @@ -1931,76 +1943,76 @@ msgstr "Nie udao si otworzy potoku dla %s" msgid "Read error from %s process" msgstr "Bd odczytu z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Oczekiwanie na nagwki" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Nieprawidowa linia nagwka" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2013,7 +2025,7 @@ msgstr "Nie mona wykona mmap na pustym pliku" msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udao si wykona mmap %lu bajtw" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" @@ -2135,7 +2147,7 @@ msgstr "Nieprawidowa operacja %s" msgid "Unable to stat the mount point %s" msgstr "Nie udao si wykona operacji stat na punkcie montowania %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nie udao si przej do %s" @@ -2292,62 +2304,62 @@ msgstr "Kandydujce wersje" msgid "Dependency generation" msgstr "Generowanie zalenoci" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nie udao si zanalizowa pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udao si zanalizowa pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidowa linia %lu w licie rde %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidowa linia %lu w licie rde %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidowa linia %lu w licie rde %s (analiza URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidowa linia %lu w licie rde %s (bezwzgldna dystrybucja)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidowa linia %lu w licie rde %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w licie rde %s jest zbyt duga." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidowa linia %u w licie rde %s (typ)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ '%s' jest nieznany - linia %u listy rde %s" +msgstr "Typ '%s' jest nieznany w linii %u listy rde %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidowa linia %u w licie rde %s (identyfikator producenta)" @@ -2386,7 +2398,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "Nie udao si naprawi problemw, zatrzymae/a uszkodzone pakiety." +msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety." #: apt-pkg/acquire.cc:62 #, c-format @@ -2398,10 +2410,17 @@ msgstr "Brakuje katalogu list %spartial." msgid "Archive directory %spartial is missing." msgstr "Brakuje katalogu archiww %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Pobieranie pliku %li z %li (%s pozostao)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Czytanie listy plikw" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2414,19 +2433,16 @@ msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomia si poprawnie." #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Zmiana nonika: Prosz woy dysk oznaczony\n" -" '%s'\n" -"do napdu '%s' i nacisn enter\n" +msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietw '%s' nie jest obsugiwany" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw" @@ -2467,69 +2483,67 @@ msgstr "Magazyn podrczny ma niezgodny system wersji" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Wystpi bd przy przetwarzaniu %s (NewPackage)" +msgstr "Wystpi bd podczas przetwarzania %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage1)" +msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage2)" +msgstr "Wystpi bd podczas przetwarzania %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Wystpi bd przy przetwarzaniu %s (NewFileVer1)" +msgstr "Wystpi bd podczas przetwarzania %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion1)" +msgstr "Wystpi bd podczas przetwarzania %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage3)" +msgstr "Wystpi bd podczas przetwarzania %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion2)" +msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Och, przekroczye/a liczb pakietw, ktr ten APT jest w stanie obsuy." +"Och, przekroczono liczb pakietw, ktr ten APT jest w stanie obsuy." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Och, przekroczye/a liczb wersji, ktr ten APT jest w stanie obsuy." +msgstr "Och, przekroczono liczb wersji, ktr ten APT jest w stanie obsuy." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Och, przekroczye/a liczb zalenoci, ktr ten APT jest w stanie " -"obsuy." +"Och, przekroczono liczb zalenoci, ktr ten APT jest w stanie obsuy." #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Wystpi bd przy przetwarzaniu %s (FindPkg)" +msgstr "Wystpi bd podczas przetwarzania %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Wystpi bd przy przetwarzaniu %s (CollectFileProvides)" +msgstr "Wystpi bd podczas przetwarzania %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Pakiet %s %s nie zosta odnaleziony przy przetwarzaniu zalenoci plikw" +"Pakiet %s %s nie zosta odnaleziony podczas przetwarzania zalenoci plikw" #: apt-pkg/pkgcachegen.cc:574 #, c-format @@ -2549,11 +2563,15 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde" msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2562,7 +2580,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2571,14 +2589,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Bdny rozmiar" @@ -2631,7 +2649,8 @@ msgstr "Skawnowanie pyty w poszukiwaniu plikw indeksu..\n" #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -"Znaleziono %i indeksw pakietw, %i indeksw rdowych i %i sygnatur\n" +"Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw " +"tumacze i %i sygnatur\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" @@ -2683,55 +2702,86 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Otwieranie %s" +msgstr "Przygotowanie %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Otwieranie %s" +msgstr "Rozpakowywanie %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Otwieranie pliku konfiguracyjnego %s" +msgstr "Przygotowanie do konfiguracji %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "czenie z %s" +msgstr "Konfigurowanie %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Zainstalowana: " +msgstr " Zainstalowany %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Przygotowanie do usunicia %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Otwieranie %s" +msgstr "Usuwanie %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Poleca" +msgstr "Usunito %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Przygotowanie do konfiguracji %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Nie udao si usun %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Poczenie zostao zamknite przedwczenie" + +#~ msgid "Reading file list" +#~ msgstr "Czytanie listy plikw" + +#~ msgid "Could not execute " +#~ msgstr "Nie udao si uruchomi " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Przygotowanie do usunicia %s wraz z konfiguracj" + +#~ msgid "Removed with config %s" +#~ msgstr "Usunito %s wraz z konfiguracj" + +#~ msgid "Total Distinct Descriptions: " +#~ msgstr "W sumie rnych opisw: " + +#~ msgid "Total Desc/File relations: " +#~ msgstr "W sumie zalenoci opis/plik: " + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)" + +#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#~ msgstr "" +#~ "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy." + +#~ msgid "Could not patch file" +#~ msgstr "Nie udao si naoy atki na plik" @@ -1,14 +1,13 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. -# Miguel Figueiredo <elmig@debianpt.org>, 2003. -# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy. +# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006. msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" -"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" +"Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,7 +101,7 @@ msgstr "Ficheiros de Pacotes :" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote" +"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" #: cmdline/apt-cache.cc:1470 #, c-format @@ -146,14 +145,14 @@ msgstr " Tabela de Versão:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -227,6 +226,19 @@ msgstr "" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" "Veja as páginas do manual apt-cache(8) e apt.conf(5) para mais informações.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Por favor insira um Disco no leitor e pressione enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repita este processo para o resto dos CDs no seu conjunto." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos não estão em pares" @@ -384,7 +396,7 @@ msgstr "" "árvore de .dscs. A opção --source-override pode ser utilizada para \n" "especificar um ficheiro override de fontes\n" "\n" -"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n" +"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" "árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" "e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n" "incluído aos campos filename caso esteja presente. Exemplo de uso do \n" @@ -502,7 +514,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Falha ao executar stat %s" @@ -511,12 +523,12 @@ msgstr "Falha ao executar stat %s" msgid "Archive had no package field" msgstr "Arquivo não possuía campo pacote" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" @@ -616,259 +628,257 @@ msgstr "Problema ao executar unlinking %s" msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "mas não está instalável" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Os seguintes NOVOS pacotes serão instalados:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Os seguintes pacotes serão REMOVIDOS:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Os seguintes pacotes serão actualizados:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Aos seguintes pacotes será feito o DOWNGRADE :" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados :" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVISO: Os seguintes pacotes essenciais serão removidos\n" -"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a " -"fazer!" +"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!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "Alguns pacotes não poderam ser autenticados" +msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Erro Interno ao adicionar um desvio" +msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n" +"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Desculpe, você não tem espaço suficiente em %s" +msgstr "Impossível de determinar espaço livre em %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Você está prestes a fazer algo potencialmente prejudicial\n" +"Você está prestes a fazer algo potencialmente nocivo.\n" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -876,47 +886,47 @@ msgstr "" "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Abortando a Instalação." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Você deve selecionar explicitamente um para instalar." +msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -927,51 +937,51 @@ msgstr "" "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "No entanto, os seguintes pacotes substituem-o:" +msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -979,25 +989,25 @@ msgstr "" "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1005,7 +1015,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1014,176 +1024,180 @@ msgid "" msgstr "" "Alguns pacotes não puderam ser instalados. Isso pode significar que\n" "você solicitou uma situação impossível ou se você está a usar a\n" -"distribuição instável, que alguns pacotes requesitados ainda não foram \n" +"distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Já que você requisitou uma única operação é extremamanete provável que o \n" +"Já que você requisitou uma única operação é extremamente provável que o \n" "pacote esteja simplesmente não instalável e deve ser enviado um relatório " "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Erro Interno, AllUpgrade quebrou as coisas" +msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " +"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " -"disponível do pacote %s pode satisfazer os requesitos de versão" +"disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, 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:2294 +#: cmdline/apt-get.cc:2338 #, 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:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1403,7 +1417,7 @@ msgstr "Arquivo é demasiado pequeno" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Falha ao ler os cabeçahos do arquivo" +msgstr "Falha ao ler os cabeçalhos do arquivo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1424,7 +1438,7 @@ msgstr "Erro Interno em AddDiversion" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" +msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" #: apt-inst/filelist.cc:510 #, c-format @@ -1437,11 +1451,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar ficheiro %s" @@ -1473,7 +1487,7 @@ msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "O directório %s está sendo substituído por um não-diretório" +msgstr "O directório %s está sendo substituído por um não-directório" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1491,10 +1505,11 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" +msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1540,7 +1555,7 @@ msgstr "Falha ao mudar para o directório administrativo %sinfo" msgid "Internal error getting a package name" msgstr "Erro Interno obtendo um Nome de Pacote" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lendo Listagem de Ficheiros" @@ -1587,10 +1602,6 @@ msgstr "Erro Interno ao adicionar um desvio" msgid "The pkg cache must be initialized first" msgstr "A cache de pacotes tem de ser inicializada primeiro" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Lendo Lista de Ficheiros" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1656,20 +1667,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Arquivo não encontrado" +msgstr "Disco não encontrado" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao executar stat" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1797,7 +1807,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1820,7 +1830,7 @@ msgstr "Transferência de dados falhou, o servidor respondeu '%s'" msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Impossível invocar " @@ -1847,77 +1857,81 @@ msgstr "Não posso iniciar a ligação para %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou" +msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ligando a %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossível ligar a %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Não foi possível resolver '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Erro interno: Assinatura válida, mas não foi possível determinar a impressão " +"digital da chave?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Pelo menos uma assinatura inválida foi encontrada." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Não foi possível obter lock %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " para verificar assinatura (gnupg instalado?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Os seguintes pacotes extra serão instalados:" +msgstr "As seguintes assinaturas estavam inválidas:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"As seguintes assinaturas não puderam ser verificadas porque a chave pública " +"não está disponível:\n" #: methods/gzip.cc:57 #, c-format @@ -1929,76 +1943,76 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Erro interno" @@ -2011,7 +2025,7 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selecção %s não encontrada" @@ -2134,7 +2148,7 @@ msgstr "Operação %s inválida" msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -2291,62 +2305,62 @@ msgstr "Versões Candidatas" msgid "Dependency generation" msgstr "Geração de Dependência" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível o parse ao ficheiro de pacote %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2396,12 +2410,19 @@ msgstr "Falta directório de listas %spartial." #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Falta o diretório de repositório %spartial." +msgstr "Falta o directório de repositório %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "A efectuar download de ficheiro %li de %li (%s restantes)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Lendo Listagem de Ficheiros" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2414,19 +2435,17 @@ msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Troca de mídia: Por favor insira o disco chamado\n" -" '%s'\n" -"na drive '%s' e pressione enter\n" +"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@ -2443,7 +2462,7 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou " +"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." #: apt-pkg/cachefile.cc:77 @@ -2552,21 +2571,27 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, 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 "" "Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " -"que você precisa consertar manualmente este pacote. (devido a arquitetura " +"que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2575,7 +2600,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2583,9 +2608,9 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "Tamanho incorreto" +msgstr "Tamanho incorrecto" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2689,59 +2714,71 @@ msgstr "" "coincidentes\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Abrindo %s" +msgstr "A preparar %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Abrindo %s" +msgstr "A desempacotar %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Abrindo ficheiro de configuração %s" +msgstr "A preparar para configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Ligando a %s" +msgstr "A configurar %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalado: " +msgstr "%s instalado" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "A preparar para remoção de %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Abrindo %s" +msgstr "A remover %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomenda" +msgstr "%s removido" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "A preparar para configurar %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Falha ao remover %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#~ msgid "Reading file list" +#~ msgstr "Lendo Lista de Ficheiros" + +#~ msgid "Could not execute " +#~ msgstr "Impossível de executar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "A preparar para remover com a configuração %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Removido com a configuração %s" + #~ msgid "The pkg cache must be initialize first" #~ msgstr "A cache de pacotes deve ser inicializada primeiro" @@ -2824,12 +2861,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgstr "Falha ao baixar %s %s\n" #, fuzzy -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "" -#~ "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " -#~ "pressione enter\n" - -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8376d4f0a..3a51c828b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-06-16 10:24-0300\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-02-11 17:57-0200\n" "Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -147,14 +147,14 @@ msgstr " Tabela de Verso:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -229,6 +229,19 @@ msgstr "" "Veja as pginas de manual apt-cache(8) e apt.conf(5) para maiores " "informaes.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Por favor, fornea um nome para este Disco, como 'Debian 2.1r1 Disco 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Por favor, insira um Disco no leitor e pressione enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Pepita este processo para o restante dos CDs em seu conjunto." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos no esto em pares" @@ -504,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Falha ao checar %s" @@ -513,12 +526,12 @@ msgstr "Falha ao checar %s" msgid "Archive had no package field" msgstr "Repositrio no possua campo pacote" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s no possui entrada override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s %s, no %s\n" @@ -618,258 +631,257 @@ msgstr "Problema executando unlinking %s" msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilao de regex - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir tm dependncias desencontradas:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "mas %s est instalado" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "mas %s est para ser instalado" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "mas no est instalvel" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "mas um pacote virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "mas no est instalado" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "mas no vai ser instalado" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir sero instalados:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir sero REMOVIDOS:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir sero mantidos em suas verses atuais :" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir sero atualizados :" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir sero REBAIXADOS de verso :" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Os pacotes segurados a seguir sero mudados :" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVISO: Os pacotes essenciais a seguir sero removidos\n" -"Isso NO deve ser feito a menos que voc saiba exatamente o que est fazendo!" +"AVISO: Os pacotes essenciais a seguir sero removidos.\n" +"Isso NO deveria ser feito a menos que voc saiba exatamente o que voc est " +"fazendo !" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu desatualizados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu no atualizados.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes no totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Corrigindo dependncias..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Impossvel corrigir dependncias" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Impossvel minimizar o conjunto de atualizaes" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Pronto" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Voc pode querer rodar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dependncias desencontradas. Tente usar -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO : Os pacotes a seguir no podem ser autenticados !" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Aviso de autenticao sobrescrito.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificao [s/N] ? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes no puderam ser autenticados" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "H problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Erro Interno ao adicionar um desvio" +msgstr "Erro Interno, Ordenao no finalizou" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Impossvel criar lock no diretrio de download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes no pde ser lida." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Que estranho .. Os tamanhos no batem, informe apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr " preciso fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr " preciso fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de desempacotamento, %sB adicionais de espao em disco sero usados.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Desculpe, voc no tem espao suficiente em %s" +msgstr "No foi possvel determinar o espao livre em %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Voc no possui espao suficiente em %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Triviais Apenas especificado mas essa no uma operao trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Sim, faa o que eu digo!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Voc est prestes a fazer algo potencialmente destruidor\n" +"Voc est prestes a fazer algo potencialmente destruidor.\n" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -877,47 +889,47 @@ msgstr "" "Impossvel pegar alguns arquivos, talvez rodar apt-get update ou tentar com " "--fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mdia no so suportados atualmente" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Impossvel corrigir pacotes faltosos." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Abortando Instalao." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invs de %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Pulando %s, j est instalado e a atualizao no est configurada.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s no est instalado, ento no ser removido\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s um pacote virtual provido por:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Voc deve selecionar um explicitamente para instalar." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -928,51 +940,51 @@ msgstr "" "Isso pode significar que o pacote est faltando, ficou obsoleto ou\n" "est disponvel somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s no tem candidato para instalao" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalao de %s no possvel, o download do mesmo no pode ser " "feito.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s j a verso mais nova.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' no foi encontrada" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verso '%s' para '%s' no foi encontrada" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Verso selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "O comando update no leva argumentos" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Impossvel criar lock no diretrio de listas" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -980,25 +992,25 @@ msgstr "" "Alguns arquivos de ndice falharam no download, eles foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Impossvel achar pacote %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expresso regular '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1006,7 +1018,7 @@ msgstr "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1018,7 +1030,7 @@ msgstr "" "distribuio instvel, que alguns pacotes requeridos no foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,117 +1040,121 @@ msgstr "" "esteja simplesmente no instalvel e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "A informao a seguir pode ajudar a resolver a situao:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir sero instalados:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calculando Atualizao... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Erro Interno, AllUpgrade quebrou as coisas" +msgstr "Erro Interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossvel encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Omitindo arquivo j obtido '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Voc no possui espao livre suficiente em %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Confira se o pacote dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construo '%s' falhou.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependncias " "de construo" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1147,7 +1163,7 @@ msgstr "" "a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde ser encontrado" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1156,32 +1172,32 @@ msgstr "" "a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito " "novo" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependncia %s para %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Mdulos Suportados:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1434,11 +1450,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de confgiurao duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar arquivo %s" @@ -1491,7 +1507,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossvel ler %s" @@ -1537,7 +1554,7 @@ msgstr "Falha ao mudar para o diretorio administrativo %sinfo" msgid "Internal error getting a package name" msgstr "Erro Interno obtendo um Nome de Pacote" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lendo Listagem de Pacotes" @@ -1581,14 +1598,9 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Lendo Listagem de Pacotes" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1656,20 +1668,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossvel desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Arquivo no encontrado" +msgstr "Disco no encontrado." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo no encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao checar" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificao" @@ -1797,7 +1808,7 @@ msgstr "Conexo do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossvel aceitar conexo" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1820,7 +1831,7 @@ msgstr "Transferncia de dados falhou, servidor respondeu '%s'" msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Impossvel invocar " @@ -1849,75 +1860,79 @@ msgstr "No posso iniciar a conexo para %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No foi possvel conectar em %s:%s (%s), conexo expirou" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No foi possvel conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "No foi possvel resolver '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falaha temporria resolvendo '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossvel conectar em %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "No foi possvel resolver '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Sando." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Erro interno : Assintura boa, mas no foi possvel determinar a impresso " +"digital da chave ?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Ao menos uma assinatura invlida foi encontrada." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "No foi possvel obter trava %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " ao verificar assinatura (o gnupg est instalado ?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Os pacotes extra a seguir sero instalados:" +msgstr "As seguintes assinaturas foram invlidas :\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"As assinaturas a seguir no puderam ser verificadas devido a chave pblica " +"no estar disponvel :\n" #: methods/gzip.cc:57 #, c-format @@ -1929,76 +1944,76 @@ msgstr "No foi possvel abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabealhos" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma nica linha de cabealho acima de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabealho ruim" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabealho de resposta invlido" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabealho Conten-Length invlido" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabealho Conten-Range invlido" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range quebrado" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Seleo falhou." -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Conexo expirou" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexo" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Dados de cabealho ruins" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Conexo falhou." -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Erro interno" @@ -2011,7 +2026,7 @@ msgstr "No foi possvel fazer mmap de arquivo vazio" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossvel fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Seleo %s no encontrada" @@ -2134,7 +2149,7 @@ msgstr "Operao %s invlida" msgid "Unable to stat the mount point %s" msgstr "Impossvel checar o ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossvel mudar para %s" @@ -2291,62 +2306,62 @@ msgstr "Verses Candidatas" msgid "Dependency generation" msgstr "Gerao de Dependncia" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossvel analizar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossvel analizar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (distribuio)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuio absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de distribuio)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na sources.lits %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' no conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2398,10 +2413,17 @@ msgstr "Diretrio de listas %spartial est faltando." msgid "Archive directory %spartial is missing." msgstr "Diretrio de repositrio %spartial est faltando." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Fazendo o download do arquivo %li de %li (%s restantes)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Lendo Listagem de Pacotes" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2414,19 +2436,17 @@ msgid "Method %s did not start correctly" msgstr "Mtodo %s no iniciou corretamente" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Troca de mdia: Por favor insira o disco nomeado\n" -" '%s'\n" -"no drive '%s' e pressione enter\n" +"Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' no suportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "No foi possvel determinar um tipo de sistema de empacotamento aplicvel." @@ -2469,37 +2489,37 @@ msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de verses incompatvel" #: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" @@ -2520,14 +2540,14 @@ msgstr "" "Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar." #: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Um erro ocorreu processando %s (FindPkg)" +msgstr "Um erro ocorreu processando %s (EncontrarPacote)" #: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu processando %s (CollectFileProvides)" +msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2552,11 +2572,15 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeao falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "No existem chaves pblicas para os seguintes IDs de chaves :\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2566,7 +2590,7 @@ msgstr "" "que voc precisa consertar manualmente este pacote. (devido a arquitetura " "no especificada)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2575,7 +2599,7 @@ msgstr "" "No foi possvel localizar arquivo para o pacote %s. Isto pode significar " "que voc precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2583,7 +2607,7 @@ msgstr "" "Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2691,59 +2715,71 @@ msgstr "" "combinam\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Abrindo %s" +msgstr "Preparando %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Abrindo %s" +msgstr "Desempacotando %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Abrindo arquivo de configurao %s" +msgstr "Preparando para configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Conectando a %s" +msgstr "Configurando %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalado: " +msgstr "%s instalado" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Preparando para a remoo de %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Abrindo %s" +msgstr "Removendo %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomenda" +msgstr "%s removido" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparando para configurar %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Falha ao remover %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexo encerrada prematuramente" +#~ msgid "Reading file list" +#~ msgstr "Lendo Listagem de Pacotes" + +#~ msgid "Could not execute " +#~ msgstr "No foi possvel executar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Preparando para remoo de %s e sua configurao" + +#~ msgid "Removed with config %s" +#~ msgstr "%s e sua configurao removidos" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s" @@ -2796,12 +2832,6 @@ msgstr "Conexo encerrada prematuramente" #~ msgstr "Falha ao baixar %s %s\n" #, fuzzy -#~ msgid "Please insert a Disc in the drive and press enter" -#~ msgstr "" -#~ "Troca de mdia: Por favor insira o disco nomeado '%s' no drive '%s' e " -#~ "pressione enter\n" - -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "No foi possvel checar a lista de pacotes fonte %s" @@ -1,19 +1,19 @@ # translation of apt_ro.po to Romanian # This file is put in the public domain. -# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005. # +# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: apt_po_ro\n" +"Project-Id-Version: apt_nou\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-08-25 17:43+0300\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-02-27 11:59+0200\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@ -147,14 +147,14 @@ msgstr " Tabela de versiuni:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,19 @@ msgstr "" " -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" "Vedeţi manualele apt-cache(8) şi apt.conf(5) pentru mai multe informaţii.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" +"Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repetaţi această procedură pentru restul CD-urilor." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentele nu sunt perechi" @@ -510,7 +523,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Eşuare în determinarea stării %s" @@ -519,12 +532,12 @@ msgstr "Eşuare în determinarea stării %s" msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" @@ -624,258 +637,257 @@ msgstr "Problemă la desfacerea %s" msgid "Failed to rename %s to %s" msgstr "Eşuare în a redenumi %s în %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependenţe neîndeplinite:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "dar nu este instalat" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " sau" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ŞTERSE:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reţinute:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ţinute vor fi schimbate:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n" +"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!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de şters şi %lu neînnoite.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Corectez dependenţele..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " eşuare." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenţele" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Nu pot micşora mulţimea pachetelor de înnoire" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Instalaţi aceste pachete fără verificare [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Eroare internă în timpul adăugării unei diversiuni" +msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB de arhive.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Nu aveţi suficient spaţiu în %s" +msgstr "N-am putut determina spaţiul disponibil în %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveţi suficient spaţiu în %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Sunteţi pe cale de a face ceva cu potenţial distructiv\n" +"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n" "Pentru a continua tastaţi fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Renunţare." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -883,47 +895,47 @@ msgstr "" "Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --" "fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -934,49 +946,49 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -984,25 +996,25 @@ msgstr "" "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1010,7 +1022,7 @@ msgstr "" "Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet " "(sau oferiţi o altă soluţie)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1023,7 +1035,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1033,117 +1045,122 @@ msgstr "" " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Eşuare" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" +msgstr "" +"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Sar peste fişierul deja descărcat '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveţi suficient spaţiu în %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, 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:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1169,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:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,32 +1178,32 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, 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:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1441,11 +1458,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Eşuare în a scrie fişierul %s" +msgstr "Eşuare în scrierea fişierului %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Eşuare în a închide fişierul %s" @@ -1498,7 +1515,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@ -1546,7 +1564,7 @@ msgstr "Eşuare în a schimba către directorul %sinfo" msgid "Internal error getting a package name" msgstr "Eroare internă la preluarea numelui de pachet" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Citire derulare fişier" @@ -1590,14 +1608,9 @@ msgid "Internal error adding a diversion" msgstr "Eroare internă în timpul adăugării unei diversiuni" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Cache-ul pachetului trebuie întâi iniţializat" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Citirea listei de fişiere" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1663,20 +1676,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fişier negăsit" +msgstr "Disc negăsit." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fişier negăsit" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Eşuare de determinare a stării" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" @@ -1804,7 +1816,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1827,7 +1839,7 @@ msgstr "Eşuare transfer de date, serverul a spus: '%s'" msgid "Query" msgstr "Interogare" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nu pot invoca" @@ -1856,75 +1868,78 @@ msgstr "Nu pot iniţia conectarea la %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "N-am putut conecta la %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nu pot rezolva '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Eşuare temporară în rezolvarea '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nu pot conecta la %s %s" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nu pot rezolva '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia " +"amprentei digitale?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Nu pot determina blocajul %s" +msgstr "Cel puţin o semnătură invalidă a fost întâlnită." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " verificarea semnăturii (este instalat gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Următoarele extra pachete vor fi instalate:" +msgstr "Următoarele semnături au fost invalide:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Următoarele semnături n-au putut fi verificate datorită cheii publice care " +"este indisponibilă:\n" #: methods/gzip.cc:57 #, c-format @@ -1936,77 +1951,77 @@ msgstr "Nu pot deschide conexiunea pentru %s" msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Eroare internă" @@ -2019,7 +2034,7 @@ msgstr "Nu pot mmap un fişier gol" msgid "Couldn't make mmap of %lu bytes" msgstr "Nu pot face mmap la %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selecţia %s nu s-a găsit" @@ -2142,7 +2157,7 @@ msgstr "Operaţiune invalidă %s" msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@ -2299,62 +2314,62 @@ msgstr "Versiuni candidat" msgid "Dependency generation" msgstr "Generare dependenţe" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nu pot analiza fişierul pachet %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greşită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greşită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greşită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" @@ -2405,10 +2420,17 @@ msgstr "Directorul de liste %spartial lipseşte." msgid "Archive directory %spartial is missing." msgstr "Directorul de arhive %spartial lipseşte." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Se descarcă fişierul %li din %li (%s rămas)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Citire derulare fişier" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2421,19 +2443,17 @@ msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Schimbare de mediu: Vă rog introduceţi discul numit\n" -" '%s'\n" -"în unitatea '%s' şi apăsaţi Enter\n" +"Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@ -2475,39 +2495,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" #: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Eroare în timpul procesării %s (Pachet Nou)" +msgstr "Eroare apărută în timpul procesării %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Eroare în timpul procesării %s (UsePackage1)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Eroare în timpul procesării %s (UsePackage2)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Eroare în timpul procesării %s (NewFileVer1)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Eroare în timpul procesării %s (NewVersion1)" +msgstr "Eroare apărută în timpul procesării %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Eroare în timpul procesării %s (UsePackage3)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Eroare în timpul procesării %s (NewVersion2)" +msgstr "Eroare apărută în timpul procesării %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2526,14 +2546,14 @@ msgstr "" "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT." #: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Eroare în timpul procesării %s (FindPkg)" +msgstr "Eroare apărută în timpul procesării %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Eroare în timpul procesării %s (CollectFileProvides)" +msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2559,11 +2579,17 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2572,7 +2598,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2581,7 +2607,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2589,7 +2615,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2694,55 +2720,67 @@ msgstr "" "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Deschidere %s" +msgstr "Se pregăteşte %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Deschidere %s" +msgstr "Se despachetează %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Deschidere fişier de configurare %s" +msgstr "Se pregăteşte configurarea %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Conectare la %s" +msgstr "Se configurează %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalat: " +msgstr "Instalat %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Se pregăteşte ştergerea lui %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Deschidere %s" +msgstr "Se şterge %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomandă" +msgstr "Şters %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Se pregăteşte configurarea %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Eşuare în ştergerea %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" + +#~ msgid "Reading file list" +#~ msgstr "Citirea listei de fişiere" + +#~ msgid "Could not execute " +#~ msgstr "Nu s-a putut executa " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Şters inclusiv configurarea %s" @@ -1,8 +1,4 @@ -# translation of apt-ru.po to Russian # translation of apt_po_ru.po to Russian -# translation of apt_ru.po to Russian -# translation of apt_ru.po to Русский язык -# translation of ru.po to Russian # Russian messages for the apt suite. # Vadim Kutchin <amadis@chemi.komisc.ru>, 2002. # Ilgiz Kalmetev <ilgiz@bashtelecom.ru>, 2002. @@ -10,20 +6,20 @@ # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004. # Dmitry Astapov <adept@umc.com.ua>, 2004. # Dmitry Astapov <adept@despammed.com>, 2004. -# Yuri Kozlov <yuray@id.ru>, 2004, 2005. +# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006. # msgid "" msgstr "" -"Project-Id-Version: apt-ru\n" +"Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-09 19:50+0400\n" -"Last-Translator: Yuri Kozlov <yuray@id.ru>\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-21 14:55+0300\n" +"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -159,14 +155,14 @@ msgstr " Таблица версий:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -239,6 +235,18 @@ msgstr "" "tmp\n" "Подробности в страницах руководства apt-cache(8) и apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Задайте имя для этого диска, например 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Вставьте диск в устройство и нажмите ввод" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Повторите этот процесс для всех имеющихся CD." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Непарные аргументы" @@ -291,7 +299,7 @@ msgid "" msgstr "" "Использование: apt-extracttemplates file1 [file2 ...]\n" "\n" -"apt-extracttemplates извлекает из пакетов Дебиан конфигурационные скрипты\n" +"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n" "и файлы-шаблоны\n" "\n" "Опции:\n" @@ -337,7 +345,6 @@ msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,7 +385,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Использование: apt-ftparchive [options] command\n" +"Использование: apt-ftparchive [параметры] команда\n" "Команды: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" @@ -387,35 +394,33 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n" -"множество стилей генерации: от полностью автоматической до замены функций\n" -"пакетов dpkg-scanpackages и dpkg-scansources\n" +"множество стилей генерации: от полностью автоматического до функциональной " +"замены\n" +"программ dpkg-scanpackages и dpkg-scansources\n" "\n" "apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n" -"каталогов, содержащих файлы .deb. Файл Package\n" -"включает в себя все управляющие записи всех пакетов. Кроме того, для " -"каждого\n" -"пакета указывает хэш MD5 и размер файла. Значения управляющих записей\n" -"\"приоритет\" (Priority) и \"секция\" (Section) могут быть изменены путём\n" -"указания файла переназначений (override)\n" +"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n" +"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n" +"полей \"приоритет\" (Priority) и \"секция\" (Section) могут быть изменены с\n" +"помощью файла override.\n" "\n" "Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n" -"каталогов, содержащих файлы .dsc.\n" -"Для указания файла override в этом режиме можно использовать\n" -"опцию --source-override.\n" +"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n" +"режиме можно использовать параметр --source-override.\n" "\n" "Команды 'packages' и 'sources' надо выполнять, находясь в корневом каталоге\n" "дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n" "с которого начинается рекурсивный обход, а файл переназначений (override)\n" "должен содержать записи о переназначениях управляющих полей. Если был " "указан\n" -"Pathprefix, то его значениt добавляется к управляющим полям, содержащим\n" +"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n" "имена файлов. Пример использования для архива Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"Опции:\n" +"Параметры:\n" " -h Этот текст\n" -" --md5 Управление генерацией MD5-хэшей\n" +" --md5 Управление генерацией MD5-хешей\n" " -s=? Указать файл переназначений (override) для пакетов с исходными " "текстами\n" " -q Не выводить сообщения в процессе работы\n" @@ -424,7 +429,7 @@ msgstr "" " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" " -c=? Использовать указанный конфигурационный файл\n" -" -o=? Указать произвольную опцию" +" -o=? Указать произвольный параметр конфигурации" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" @@ -525,7 +530,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" @@ -534,12 +539,12 @@ msgstr "Не удалось получить атрибуты %s" msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" @@ -640,264 +645,264 @@ msgstr "Не удалось удалить %s" msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "но он не установлен" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" +"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " не удалось." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Аутентификационное предупреждение не принято в внимание.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а опция -y использована без --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" +"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " +"пакетами!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Внутренняя ошибка при добавлении diversion" +msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "После распаковки объем занятого дискового пространства возрастёт на %sB.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Недостаточно места в %s" +msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"То, что вы хотите сделать, может иметь нежелательные последствия\n" +"То, что вы хотите сделать, может иметь нежелательные последствия.\n" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,48 +910,48 @@ msgstr "" "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,49 +962,49 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,27 +1012,27 @@ msgstr "" "Некоторые индексные файлы не загрузились, они были проигнорированы или " "вместо них были использованы старые версии" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Не могу найти пакет %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1035,7 +1040,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1046,7 +1051,7 @@ msgstr "" "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1056,121 +1061,125 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация возможно поможет Вам:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" -msgstr "Настойчиво рекомендуемые пакеты:" +msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Рассчёт обновлений... " +msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Внутренняя ошибка, AllUpgrade все поломал" +msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Пропускаем уже загруженный файл '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1188,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1197,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1465,11 +1474,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Не удалось записать файл %s" +msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" @@ -1522,7 +1531,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@ -1568,7 +1578,7 @@ msgstr "Не удалось сменить текущий каталог на а msgid "Internal error getting a package name" msgstr "Внутренняя ошибка при получении имени пакета" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Чтение списков файлов в пакете" @@ -1614,10 +1624,6 @@ msgstr "Внутренняя ошибка при добавлении diversion" msgid "The pkg cache must be initialized first" msgstr "В первую очередь должен быть проинициализирован кэш пакетов" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Чтение списка файлов в пакете" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1683,20 +1689,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Файл не найден" +msgstr "Диск не найден." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1828,7 +1833,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хэшировании файла" @@ -1851,7 +1856,7 @@ msgstr "Передача данных завершилась неудачно, msgid "Query" msgstr "Запрос" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Невозможно вызвать " @@ -1880,157 +1885,161 @@ msgstr "Невозможно инициализировать соединени msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Не могу найти IP адрес для %s" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Не могу найти IP адрес для %s" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " +"работы." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " +"ключа?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Не могу получить доступ к файлу блокировки %s" +msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "для проверки подписи (gnupg установлена?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Будут установлены следующие дополнительные пакеты:" +msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Не могу породить процесс %s" +msgstr "Не удалось открыть канал для %s" #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2043,7 +2052,7 @@ msgstr "Невозможно отобразить в память пустой msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" @@ -2166,7 +2175,7 @@ msgstr "Неверная операция %s" msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" @@ -2279,7 +2288,7 @@ msgstr "ПредЗависит" #: apt-pkg/pkgcache.cc:218 msgid "Suggests" -msgstr "Настойчиво рекомендует" +msgstr "Предлагает" #: apt-pkg/pkgcache.cc:219 msgid "Recommends" @@ -2329,63 +2338,63 @@ msgstr "Версии-кандидаты" msgid "Dependency generation" msgstr "Генерирование зависимостей" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Невозможно прочесть содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Неизвестен тип '%s' в строке %u в списке источников %s" +msgstr "Неизвестный тип '%s' в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" @@ -2435,10 +2444,17 @@ msgstr "Каталог %spartial отсутствует." msgid "Archive directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Загружается файл %li из %li (%s осталось)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Чтение списков файлов в пакете" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2451,18 +2467,16 @@ msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " -"ввод\n" +msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" @@ -2580,11 +2594,15 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Недоступен общий ключ для следующих ключей (ID):\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2593,7 +2611,7 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2602,13 +2620,13 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2713,58 +2731,70 @@ msgstr "Сохранено %i записей с %i несовпадающими msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " -"файлами.\n" +"файлами\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Открытие %s" +msgstr "Подготавливается %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Открытие %s" +msgstr "Распаковывается %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Открытие файла конфигурации %s" +msgstr "Подготавливается для конфигурации %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Соединение с %s" +msgstr "Настройка %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Установлен: " +msgstr "Установлен %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Подготавливается для удаления %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Открытие %s" +msgstr "Удаление %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Рекомендует" +msgstr "Удалён %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Подготавливается для конфигурации %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Не удалось удалить %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" + +#~ msgid "Reading file list" +#~ msgstr "Чтение списка файлов в пакете" + +#~ msgid "Could not execute " +#~ msgstr "Не удалось выполнить " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Подготавливается для удаления вместе с настройками %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Удалён вместе с настройками %s" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-07-01 09:34+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-05-29 15:33+0200\n" "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" "MIME-Version: 1.0\n" @@ -146,14 +146,14 @@ msgstr " Tabuľka verzií:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -227,6 +227,18 @@ msgstr "" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" "Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Zadajte názov tohto disku, napríklad 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Vložte disk do mechaniky a stlačte Enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Zopakujte tento proces pre všetky CD v sade diskov." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nie sú vo dvojiciach" @@ -500,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" @@ -509,12 +521,12 @@ msgstr "%s sa nedá vyhodnotiť" msgid "Archive had no package field" msgstr "Archív neobsahuje pole package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku pre override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" @@ -614,80 +626,79 @@ msgstr "Problém s odlinkovaním %s" msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " alebo" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -695,176 +706,177 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových inštalovaných, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviť" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovať" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu môžete spustiť `apt-get -f install'." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "Nedala sa zistiť vierohodnoť niektorých balíkov" +msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Vnútorná chyba pri pridávaní diverzie" +msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." +"debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuť %sB archívov.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Na %s nemáte dostatok voľného miesta" +msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Možno sa chystáte vykonať niečo škodlivé\n" +"Možno sa chystáte vykonať niečo škodlivé.\n" "Pre pokračovanie opíšte frázu '%s'\n" " ?]" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Prerušené." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -872,47 +884,47 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena média nie sú momentálne podporované" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr "[Inštalovaný]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybrať jeden na inštaláciu." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -922,49 +934,49 @@ msgstr "" "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Avšak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inštaláciu" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -972,25 +984,25 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa " "použili staršie verzie." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -998,7 +1010,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1010,7 +1022,7 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1020,124 +1032,128 @@ msgstr "" "balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n" "(bug report) pre daný balík." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Vnútorná chyba, AllUpgrade pokazil veci" +msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, 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:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, 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:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti pre zostavenie %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1146,31 +1162,31 @@ msgstr "" "%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1419,11 +1435,11 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Zápis do súboru %s zlyhal" +msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -1476,7 +1492,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítať" @@ -1522,7 +1539,7 @@ msgstr "Nedá sa zmeniť na admin adresár %sinfo" msgid "Internal error getting a package name" msgstr "Vnútorná chyba pri získavaní názvu balíka" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Načítavam výpis súborov" @@ -1566,14 +1583,9 @@ msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Načítavam zoznam súborov" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1639,20 +1651,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Súbor nebol nájdený" +msgstr "Disk sa nenašiel." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Súbor nebol nájdený" +msgstr "Súbor sa nenašiel" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1780,7 +1791,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1803,7 +1814,7 @@ msgstr "Prenos dát zlyhal, server odpovedal '%s'" msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -1832,75 +1843,78 @@ msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nedá sa zistiť '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné zlyhanie pri zisťovaní '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Niečo veľmi zlé sa prihodilo pri zisťovaní '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nedá sa pripojiť k %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Zväzok kľúčov '%s' je nedostupný." + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje " +"sa." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Zámok %s sa nedá získať" +msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "Nedá sa spustiť '%s' na kontrolu signatúry (je nainštalované gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Nainštalujú sa nasledovné extra balíky:" +msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " +"kľúč:\n" #: methods/gzip.cc:57 #, c-format @@ -1912,76 +1926,76 @@ msgstr "Nedá sa otvoriť rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "Http server poslal neplatnú hlavičku odpovede" +msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http server poslal neplatnú hlavičku Content-Length" +msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http server poslal neplatnú hlavičku Content-Range" +msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Vnútorná chyba" @@ -1994,7 +2008,7 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru" msgid "Couldn't make mmap of %lu bytes" msgstr "Nedá sa urobiť mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" @@ -2116,7 +2130,7 @@ msgstr "Neplatná operácia %s" msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiť" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsť do %s" @@ -2273,62 +2287,62 @@ msgstr "Kandidátske verzie" msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" @@ -2365,7 +2379,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v narušenom stave." +msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." #: apt-pkg/acquire.cc:62 #, c-format @@ -2377,10 +2391,17 @@ msgstr "Adresár zoznamov %spartial chýba." msgid "Archive directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Sťahuje sa %li. súbor z %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2393,19 +2414,16 @@ msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Výmena média: Vložte disk nazvaný\n" -" '%s'\n" -"do mechaniky '%s' a stlačte Enter\n" +msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému" @@ -2444,39 +2462,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Chyba pri spracovaní %s (NewPackage)" +msgstr "Chyba pri spracovávaní %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Chyba pri spracovaní %s (UsePackage1)" +msgstr "Chyba pri spracovávaní %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Chyba pri spracovaní %s (UsePackage2)" +msgstr "Chyba pri spracovávaní %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Chyba pri spracovaní %s (NewFileVer1)" +msgstr "Chyba pri spracovávaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Chyba pri spracovaní %s (NewVersion1)" +msgstr "Chyba pri spracovávaní %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Chyba pri spracovaní %s (UsePackage3)" +msgstr "Chyba pri spracovávaní %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Chyba pri spracovaní %s (NewVersion2)" +msgstr "Chyba pri spracovávaní %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2493,14 +2511,14 @@ msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." #: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Chyba pri spracovaní %s (FindPkg)" +msgstr "Chyba pri spracovávaní %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Chyba pri spracovaní %s (CollectFileProvides)" +msgstr "Chyba pri spracovávaní %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2525,11 +2543,15 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2538,7 +2560,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2547,13 +2569,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2658,58 +2680,56 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Otvára sa %s" +msgstr "Pripravuje sa %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Otvára sa %s" +msgstr "Rozbaľuje sa %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Otvára sa konfiguračný súbor %s" +msgstr "Pripravuje sa nastavenie %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Pripája sa k %s" +msgstr "Nastavuje sa %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Nainštalovaná verzia: " +msgstr "Nainštalovaný balík %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Pripravuje sa odstránenie %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Otvára sa %s" +msgstr "Odstraňuje sa %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Odporúča" +msgstr "Odstránený balík %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "" +msgid "Preparing to completely remove %s" +msgstr "Pripravuje sa úplné odstránenie %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "" +msgid "Completely removed %s" +msgstr "Balík '%s' je úplne odstránený" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure uhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -143,14 +143,14 @@ msgstr " Tabela razliic:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -224,6 +224,22 @@ msgstr "" " -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" "Za ve informacij si oglejte strani man apt-cache(8) in apt.conf(5).\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"Sprememba medija: vstavite disk z oznako\n" +" '%s'\n" +"v enoto '%s' in pritisnite enter\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenti niso v parih" @@ -498,7 +514,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Napaka pri postavitvi %s" @@ -507,12 +523,12 @@ msgstr "Napaka pri postavitvi %s" msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" @@ -612,79 +628,79 @@ msgstr "Napaka pri odvezovanju %s" msgid "Failed to rename %s to %s" msgstr "Ni mogoe preimenovati %s v %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nereene odvisnosti:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameen" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "vendar ni nameen" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "vendar ne bo nameen" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " ali" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadrani:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Naslednji zadrani paketi bodo spremenjeni:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -693,144 +709,144 @@ msgstr "" "OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" "To NI priporoljivo, razen e natanno veste, kaj ponete." -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameenih, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Ni mogoe popraviti odvisnosti" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoe pomanjati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Nereene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -841,28 +857,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -870,47 +886,47 @@ msgstr "" "Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Ni mogoe popraviti manjkajoih paketov." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni nameen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Nameeno]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga elite namestiti." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -921,49 +937,49 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnoveja razliica %s je e nameena.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razliice '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -971,25 +987,25 @@ msgstr "" "Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " "uporabljena stareja." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -997,7 +1013,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1008,7 +1024,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1018,125 +1034,130 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1145,31 +1166,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1424,7 +1445,7 @@ msgstr "Dvojnik datoteke z nastavitvami %s/%s" msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Napaka pri zapiranju datoteke %s" @@ -1477,7 +1498,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni mogoe brati %s" @@ -1523,7 +1545,7 @@ msgstr "Premik v skrbnikov imenik %sinfo ni uspel" msgid "Internal error getting a package name" msgstr "Notranja napaka pri sprejemanju imena paketa" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Branje seznama datotek" @@ -1569,10 +1591,6 @@ msgstr "Notranja napaka pri dodajanju odklona" msgid "The pkg cache must be initialized first" msgstr "Najprej se mora izvesti predpomnilnik paketov" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Branje seznama datotek" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1646,12 +1664,12 @@ msgstr "Datoteke ni mogoe najti" msgid "File not found" msgstr "Datoteke ni mogoe najti" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Doloitev ni uspela" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1779,7 +1797,7 @@ msgstr "Povezava podatkovne vtinice potekla" msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1802,7 +1820,7 @@ msgstr "Prenos podatkov ni uspel, strenik je odgovoril '%s'" msgid "Query" msgstr "Poizvedba" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Ni mogoe zagnati " @@ -1831,71 +1849,71 @@ msgstr "Ni mogoe zaeti povezave z %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoe povezati z %s:%s (%s). Povezava potekla." -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ni se mogoe povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoe razreiti '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Zaasna napaka pri razreevanju '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ni se mogoe povezati z %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Ni mogoe razreiti '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Ni mogoe dobiti zaklenjene datoteke %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1911,76 +1929,76 @@ msgstr "Ni mogoe odprti %s" msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "akanje na glave" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Napana vrstica glave" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Strenik HTTP je poslal napano glavo odgovora" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Notranja napaka" @@ -1993,7 +2011,7 @@ msgstr "mmap prazne datoteke ni mogo" msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoe narediti mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Izbira %s ni mogoe najti" @@ -2115,7 +2133,7 @@ msgstr "Napana operacija %s" msgid "Unable to stat the mount point %s" msgstr "Ni mogoe doloiti priklopne toke %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoe spremeniti v %s" @@ -2272,62 +2290,62 @@ msgstr "Razliice kandidatov" msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoe razleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" @@ -2377,11 +2395,18 @@ msgstr "Manjka imenik s seznami %spartial." msgid "Archive directory %spartial is missing." msgstr "Manjka imenik z arhivi %spartial." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Branje seznama datotek" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2400,12 +2425,12 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema" @@ -2523,11 +2548,15 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2536,7 +2565,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2545,7 +2574,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2553,7 +2582,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2699,18 +2728,25 @@ msgid "Removed %s" msgstr "Priporoa" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Odpiranje nastavitvene datoteke %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Odstranitev %s ni uspela" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#~ msgid "Reading file list" +#~ msgstr "Branje seznama datotek" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "Ni mogoe dobiti zaklenjene datoteke %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s" @@ -1,28 +1,31 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages # Peter Karlsson <peterk@debian.org>, 2002-2005. -# Based on Danish messages -# Claus Hindsgaul <claus_h@image.dk>, 2002. -# +# Daniel Nylander <po@danielnylander.se>, 2005. +# msgid "" msgstr "" -"Project-Id-Version: apt 0.6\n" +"Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-10-09 09:41+0200\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-05-18 08:35+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -"Language-Team: Swedish <sv@li.org>\n" +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s version %s har ett beroende som inte kan tillfredsstllas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:175 +#: cmdline/apt-cache.cc:527 +#: cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 +#: cmdline/apt-cache.cc:989 +#: cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" @@ -84,7 +87,8 @@ msgstr "Totalt bortkastat utrymme: " msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogras fr: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:446 +#: cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s r ur synk." @@ -101,7 +105,8 @@ msgstr "Inga paket funna" msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1469 +#: cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen r ur synk, kan inte korsreferera en paketfil" @@ -116,7 +121,8 @@ msgstr "%4i %s\n" msgid "Pinned packages:" msgstr "Fastnlade paket:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1494 +#: cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(ej funnen)" @@ -125,7 +131,8 @@ msgstr "(ej funnen)" msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1517 +#: cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(ingen)" @@ -148,14 +155,18 @@ msgstr " Versionstabell:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1652 +#: cmdline/apt-cdrom.cc:138 +#: cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 +#: ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2369 +#: cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fr %s %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -229,6 +240,18 @@ msgstr "" " -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n" "Se manualsidorna fr apt-cache(8) och apt.conf(5) fr mer information.\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Ange ett namn fr denna skiva, ssom \"Debian 2.1r1 Disk 1\"" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Mata in skivan i enheten och tryck Enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repetera denna process fr resten av CD-skivorna i din uppsttning." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Flaggorna gavs inte parvis" @@ -290,7 +313,8 @@ msgstr "" " -c=? Ls denna instllningsfil.\n" " -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 +#: apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -299,13 +323,17 @@ msgstr "Kunde inte skriva till %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda p debconfs version. r debconf installerat?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:167 +#: ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Listan ver filtillgg fr Packages r fr lng" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:169 +#: ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 +#: ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" @@ -464,7 +492,8 @@ msgstr "V: " msgid "E: Errors apply to file " msgstr "F: Felen gller filen " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:151 +#: ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades att sl upp %s" @@ -504,8 +533,12 @@ msgstr "*** Misslyckades att lnka %s till %s" msgid " DeLink limit of %sB hit.\n" msgstr " Avlnkningsgrns p %sB ndd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: ftparchive/writer.cc:358 +#: apt-inst/extract.cc:181 +#: apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 +#: apt-inst/deb/dpkgdb.cc:121 +#: methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades att ta status p %s" @@ -515,13 +548,15 @@ msgstr "Misslyckades att ta status p %s" msgid "Archive had no package field" msgstr "Arkivet har inget package-flt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 +#: ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 +#: ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig fr %s r %s ej %s\n" @@ -531,32 +566,38 @@ msgstr " ansvarig fr %s r %s ej %s\n" msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:353 +#: ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades att allokera minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:38 +#: ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" msgstr "Kunde inte ppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:64 +#: ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:78 +#: ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:92 +#: ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:131 +#: ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "Misslyckades att lsa override-filen %s" @@ -572,7 +613,8 @@ msgstr "Oknd komprimeringsalgoritm \"%s\"" msgid "Compressed output %s needs a compression set" msgstr "Komprimerad utdata %s behver en komprimeringsuppsttning" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 +#: methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades att skapa IPC-rr till underprocess" @@ -618,84 +660,86 @@ msgstr "Misslyckades att lsa vid berkning av MD5" msgid "Problem unlinking %s" msgstr "Problem med att lnka ut %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:490 +#: apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades att byta namn p %s till %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 +#: cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljrt uttryck - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Fljande paket har beroenden som inte kan tillfredsstllas:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "men %s r installerat" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "men %s skall installeras" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "men det r ett virtuellt paket" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "men det r inte installerat" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "Fljande NYA paket kommer att installeras:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "Fljande paket kommer att TAS BORT:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "Fljande paket har hllits tillbaka:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "Fljande paket kommer att uppgraderas:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Fljande paket kommer att NEDGRADERAS:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Fljande hllna paket kommer att ndras:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (p grund av %s) " -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -703,143 +747,150 @@ msgstr "" "VARNING: Fljande systemkritiska paket kommer att tas bort\n" "Detta br INTE gras svida du inte vet exakt vad du gr!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu uppgraderade, %lu nyinstallerade, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "%lu ominstallerade, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderade, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu ej uppgraderade.\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Rttar beroenden...." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Kunde inte rtta beroenden" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsttningen" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan mjligen rtta dessa genom att kra \"apt-get -f install\"." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsstllda beroenden. Frsk med -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Fljande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "Authentiseringsvarning verkrd.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "Ngra av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppsttt och -y anvndes utan --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen frdigstlldes inte" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 +#: cmdline/apt-get.cc:1800 +#: cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 +#: cmdline/apt-get.cc:1881 +#: cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian.org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behver hmta %sB/%sB arkiv.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behver hmta %sB arkiv.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigras p disken.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte lsa av ledigt utrymme i %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -847,81 +898,80 @@ msgid "" " ?] " msgstr "" "Du r p vg att gra ngot som kan vara skadligt\n" -"Skriv frasen '%s' fr att fortstta\n" +"Skriv frasen \"%s\" fr att fortstta\n" " ?] " # Visas d man svarar nej -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:893 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 +#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hmta %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Misslyckades att hmta vissa filer" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" -#: cmdline/apt-get.cc:984 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med " -"--fix-missing." +#: cmdline/apt-get.cc:986 +msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" +msgstr "Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med --fix-missing." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stds inte nnu" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Kunde inte rtta saknade paket." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, vljer %s istllet fr %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, 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" +msgstr "Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s r inte installerat, s tas inte bort\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "Du br explicit ange ett att installera." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -932,83 +982,76 @@ msgstr "" "Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n" "bara r tillgngligt frn andra kllor\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Dock kan fljande paket erstta det:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s r redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgvan \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) fr %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" -#: cmdline/apt-get.cc:1355 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla " -"anvnts istllet." +#: cmdline/apt-get.cc:1384 +msgid "Some index files failed to download, they have been ignored, or old ones used instead." +msgstr "Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla anvnts istllet." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 +#: cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr regex \"%s\"\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1529 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " -"(eller ange en lsning)." +#: cmdline/apt-get.cc:1549 +msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." +msgstr "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket (eller ange en lsning)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 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" @@ -1020,7 +1063,7 @@ msgstr "" "distributionen, att ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"Incoming\"." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1030,156 +1073,156 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skrivas." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 +#: methods/ftp.cc:702 +#: methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlsaren brt snder saker" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Hoppar ver redan hmtad fil \"%s\"\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Misslyckades att hmta vissa arkiv." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Kontrollera om paketet 'dpkg-dev' r installerat.\n" +msgstr "Kontrollera att paketet \"dpkg-dev\" r installerat.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" -msgstr "" -"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" +msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" +msgstr "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" -msgstr "" -"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " -"versioner av paketet %s uppfyller versionskraven" +msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements" +msgstr "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "" -"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s " -"r fr nytt" +msgstr "Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s r fr nytt" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Moduler som stds:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1332,8 +1375,12 @@ msgstr "" msgid "Bad default setting!" msgstr "Ogiltig standardinstllning!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 +#: dselect/install:83 +#: dselect/install:87 +#: dselect/install:93 +#: dselect/install:104 +#: dselect/update:45 msgid "Press enter to continue." msgstr "Tryck Enter fr att fortstta." @@ -1353,8 +1400,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "saknade beroenden. Detta r okej, bara felen ovanfr detta" #: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +msgid "above this message are important. Please fix them and run [I]nstall again" msgstr "meddelande r viktiga. Frsk rtta dem och [I]nstallera igen" #: dselect/update:30 @@ -1369,7 +1415,8 @@ msgstr "Misslyckades att skapa rr" msgid "Failed to exec gzip " msgstr "Misslyckades att kra gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:180 +#: apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Frdrvat arkiv" @@ -1390,7 +1437,8 @@ msgstr "Ogiltig arkivsignatur" msgid "Error reading archive member header" msgstr "Misslyckades att lsa huvud fr arkivdel" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:93 +#: apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelshuvud" @@ -1434,17 +1482,21 @@ msgstr "Omdirigering %s -> %s inlagd tv gnger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:45 +#: apt-inst/dirstream.cc:50 +#: apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 +#: apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades att stnga filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:96 +#: apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "Skvgen %s r fr lng" @@ -1464,7 +1516,8 @@ msgstr "Katalogen %s r omdirigerad" msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet frsker skriva till omdirigeringsmlet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:157 +#: apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "Omdirigeringsskvgen r fr lng" @@ -1492,8 +1545,12 @@ msgstr "Skriver ver pakettrff utan version fr %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver ver den i paketet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:467 +#: apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 +#: apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 +#: apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte lsa %s" @@ -1503,12 +1560,14 @@ msgstr "Kunde inte lsa %s" msgid "Unable to stat %s" msgstr "Kunde inte ta status p %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:55 +#: apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "Misslyckades att ta bort %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:110 +#: apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "Kunde inte skapa %s" @@ -1523,8 +1582,10 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp mste ligga p samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 +#: apt-inst/deb/dpkgdb.cc:139 +#: apt-pkg/pkgcachegen.cc:643 +#: apt-pkg/pkgcachegen.cc:712 +#: apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 msgid "Reading package lists" msgstr "Lser paketlistor" @@ -1535,26 +1596,24 @@ msgstr "Lser paketlistor" msgid "Failed to change to the admin dir %sinfo" msgstr "Kunde inte g till adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:201 +#: apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "Internt fel nr namn p Package-fil skulle hmtas" #: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Lser fillista" #: apt-inst/deb/dpkgdb.cc:216 #, c-format -msgid "" -"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " -"then make it empty and immediately re-install the same version of the " -"package!" -msgstr "" -"Misslyckades att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa " -"filen, skapa en tom och installera omedelbart om samma version av paketet!" +msgid "Failed to open the list file '%sinfo/%s'. If you cannot restore this file then make it empty and immediately re-install the same version of the package!" +msgstr "Misslyckades att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa filen, skapa en tom och installera omedelbart om samma version av paketet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:229 +#: apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Misslyckades att lsa listfilen %sinfo/%s" @@ -1572,7 +1631,8 @@ msgstr "Misslyckades att ppna omdirigeringsfilen %sdiversions" msgid "The diversion file is corrupted" msgstr "Omdirigeringsfilen r trasig" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:331 +#: apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" @@ -1586,10 +1646,6 @@ msgstr "Internt fel nr en omdirigering skulle lggas till" msgid "The pkg cache must be initialized first" msgstr "Paketcachen mste ha initierats frst" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Lser fillista" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1605,7 +1661,8 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Fel vid tolkning av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:42 +#: apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta r inte ett giltigt DEB-arkiv, delen \"%s\" saknas" @@ -1639,12 +1696,8 @@ msgid "Unable to read the cdrom database %s" msgstr "Kunde inte lsa cd-rom-databasen %s" #: methods/cdrom.cc:123 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "" -"Anvnd apt-cdrom fr att APT ska knna igen denna cd. apt-get update kan " -"inte anvndas fr att lgga till skivor" +msgid "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update cannot be used to add new CD-ROMs" +msgstr "Anvnd apt-cdrom fr att APT ska knna igen denna cd. apt-get update kan inte anvndas fr att lgga till skivor" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1659,16 +1712,22 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anvnds." msgid "Disk not found." msgstr "Disk ej funnen." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:177 +#: methods/file.cc:79 +#: methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 +#: methods/gpgv.cc:275 +#: methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 +#: methods/gpgv.cc:272 +#: methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Misslyckades stta modifieringstid" @@ -1689,7 +1748,8 @@ msgstr "Kunde inte ta reda p namn p partner" msgid "Unable to determine the local name" msgstr "Kunde inte ta reda p eget namn" -#: methods/ftp.cc:204 methods/ftp.cc:232 +#: methods/ftp.cc:204 +#: methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" @@ -1705,12 +1765,8 @@ msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" #: methods/ftp.cc:237 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" -"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" -"ProxyLogin r tom." +msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty." +msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin r tom." #: methods/ftp.cc:265 #, c-format @@ -1722,7 +1778,10 @@ msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:329 +#: methods/ftp.cc:440 +#: methods/rsh.cc:183 +#: methods/rsh.cc:226 msgid "Connection timeout" msgstr "Inget svar p frbindelsen inom tidsgrnsen" @@ -1730,23 +1789,31 @@ msgstr "Inget svar p frbindelsen inom tidsgrnsen" msgid "Server closed the connection" msgstr "Servern stngde frbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 +#: apt-pkg/contrib/fileutl.cc:471 +#: methods/rsh.cc:190 msgid "Read error" msgstr "Lsfel" -#: methods/ftp.cc:345 methods/rsh.cc:197 +#: methods/ftp.cc:345 +#: methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:362 methods/ftp.cc:374 +#: methods/ftp.cc:362 +#: methods/ftp.cc:374 msgid "Protocol corruption" msgstr "Protokollet frdrvat" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 +#: apt-pkg/contrib/fileutl.cc:510 +#: methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +#: methods/ftp.cc:687 +#: methods/ftp.cc:693 +#: methods/ftp.cc:729 msgid "Could not create a socket" msgstr "Kunde inte skapa uttag (socket)" @@ -1796,7 +1863,9 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrns" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 +#: methods/http.cc:958 +#: methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1805,7 +1874,8 @@ msgstr "Problem med att lgga filen till hashtabellen" msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hmta filen, servern sade \"%s\"" -#: methods/ftp.cc:892 methods/rsh.cc:322 +#: methods/ftp.cc:892 +#: methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgrns" @@ -1820,7 +1890,7 @@ msgstr "Dataverfring misslyckades, servern sade \"%s\"" msgid "Query" msgstr "Frgar" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Kunde inte starta " @@ -1851,76 +1921,73 @@ msgstr "Kunde inte pbrja anslutning till %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), tog fr lng tid" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 +#: methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Kunde inte sl upp \"%s\"" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporrt fel vid uppslagning av \"%s\"" # Oknd felkod; %i = koden -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Ngot otckt hnde nr \"%s:%s\" slogs upp (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Kunde inte komma t nyckelring: \"%s\"" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan frn Acquire::gpgv::Options fr lng. Avslutar." -#: methods/gpgv.cc:191 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" -"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" +#: methods/gpgv.cc:198 +msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "tminstone en giltig signatur trffades p." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Kunde inte exekvera " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr " fr att verifiera signature (r gnupg installerad?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "Kunde inte starta \"%s\" fr att verifiera signatur (r gnupg installerad?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Oknt fel vid exekvering av gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Fljande signaturer r ogiltiga:\n" -#: methods/gpgv.cc:244 -msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" -msgstr "" -"Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte r tillgnglig:\n" +#: methods/gpgv.cc:250 +msgid "The following signatures couldn't be verified because the public key is not available:\n" +msgstr "Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte r tillgnglig:\n" #: methods/gzip.cc:57 #, c-format @@ -1933,76 +2000,77 @@ msgstr "Kunde inte ppna rr fr %s" msgid "Read error from %s process" msgstr "Lsfel p %s-processen" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Vntar p huvuden" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad p %u tecken" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 +#: methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern snde ett ogiltigt svarshuvud" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern snde ett ogiltigt Content-Length-huvud" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern snde ett ogiltigt Content-Range-huvud" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denna http-servers std fr delvis hmtning fungerar inte" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Internt fel" @@ -2015,7 +2083,7 @@ msgstr "Kan inte utfra mmap p en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utfra mmap p %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Valet %s ej funnet" @@ -2060,7 +2128,8 @@ msgstr "Syntaxfel %s:%u: Direktiv kan endast utfras p toppnivn" msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: Fr mnga nstlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:695 +#: apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad hrifrn" @@ -2090,7 +2159,8 @@ msgstr "%c%s... Frdig" msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandoradsflagga \"%c\" [frn %s] r ej knd." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:106 +#: apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" @@ -2101,12 +2171,14 @@ msgstr "Frstr inte kommandoradsflaggan %s" msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s r inte boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:166 +#: apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s krver ett vrde." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:201 +#: apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Flagga %s: Den angivna konfigurationsposten mste innehlla =<vrde>." @@ -2137,7 +2209,9 @@ msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status p monteringspunkt %s." # Felmeddelande fr misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 +#: apt-pkg/acquire.cc:427 +#: apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte g till %s" @@ -2279,13 +2353,14 @@ msgstr "normalt" #: apt-pkg/pkgcache.cc:232 msgid "optional" -msgstr "valbart" +msgstr "valfri" #: apt-pkg/pkgcache.cc:232 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:60 +#: apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Bygger beroendetrd" @@ -2297,77 +2372,72 @@ msgstr "Kandiderande versioner" msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i kllistan %s har fel format (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i kllistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i kllistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i kllistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i kllistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "ppnar %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 +#: apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u fr lng i kllistan %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i kllistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typen \"%s\" r oknd p rad %u i kllistan %s" +msgstr "Typ \"%s\" r oknd p rad %u i listan ver kllor %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 +#: apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)" #: apt-pkg/packagemanager.cc:402 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Fr att genomfra denna installation mste det systemkritiska paketet %s " -"tillflligt tas bort p grund av en beroendespiral i Conflicts/Pre-Depends. " -"Detta r oftast en dlig id, men om du verkligen vill gra det kan du " -"aktivera flaggan \"APT::Force-LoopBreak\"." +msgid "This installation run will require temporarily removing the essential package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "Fr att genomfra denna installation mste det systemkritiska paketet %s tillflligt tas bort p grund av en beroendespiral i Conflicts/Pre-Depends. Detta r oftast en dlig id, men om du verkligen vill gra det kan du aktivera flaggan \"APT::Force-LoopBreak\"." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2376,18 +2446,12 @@ msgstr "Indexfiler av typ \"%s\" stds inte" #: apt-pkg/algorithms.cc:241 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det." +msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det." #: apt-pkg/algorithms.cc:1059 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p " -"hllna paket." +msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages." +msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p hllna paket." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." @@ -2403,10 +2467,17 @@ msgstr "Listkatalogen %spartial saknas." msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Hmtar fil %li av %li (%s terstr)" + +#: apt-pkg/acquire.cc:825 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "Laddar ner fil %li av %li (%s terstr)" +msgid "Retrieving file %li of %li" +msgstr "Hmtar fil %li av %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2421,15 +2492,15 @@ msgstr "Metoden %s startade inte korrekt" #: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter." +msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stds inte" -# -#: apt-pkg/init.cc:135 +# +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgra en lmpligt paketsystemstyp" @@ -2541,7 +2612,8 @@ msgstr "Kunde inte ta status p kllkodspaketlistan %s" msgid "Collecting File Provides" msgstr "Samlar filberoenden" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:785 +#: apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av kllcache" @@ -2550,35 +2622,31 @@ msgstr "In-/utfel vid lagring av kllcache" msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 +#: apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stmmer inte" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n" + +#: apt-pkg/acquire-item.cc:753 #, 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 "" -"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " -"manuellt mste reparera detta paket (p grund av saknad arkitektur)." +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 "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format -msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." -msgstr "" -"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " -"manuellt mste reparera detta paket." +msgid "I wasn't able to locate file for the %s package. This might mean you need to manually fix this package." +msgstr "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du manuellt mste reparera detta paket." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Storleken stmmer inte" @@ -2596,7 +2664,8 @@ msgstr "" "Anvnder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:516 +#: apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifierar.. " @@ -2723,30 +2792,38 @@ msgstr "Tog bort %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "Frbereder fr borttagning med konfiguration %s" +msgid "Preparing to completely remove %s" +msgstr "Frbereder att ta bort hela %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "Borttagen med konfiguration %s" +msgid "Completely removed %s" +msgstr "Tog bort hela %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Frbindelsen stngdes i frtid" +#~ msgid "Reading file list" +#~ msgstr "Lser fillista" +#~ msgid "Could not execute " +#~ msgstr "Kunde inte exekvera " +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Frbereder fr borttagning med konfiguration %s" +#~ msgid "Removed with config %s" +#~ msgstr "Borttagen med konfiguration %s" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" - #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" #~ "You might want to run `apt-get -f install' to correct these." #~ msgstr "" -#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan möjligen\n" +#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan " +#~ "möjligen\n" #~ "rätta detta genom att köra \"apt-get -f install\"." - #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" #~ "Beklagar, men du har inte tillräckligt ledigt utrymme pÃ¥ %s för att " #~ "lagra alla .deb-filerna." + @@ -1,17 +1,17 @@ # Tagalog messages for apt debconf. # Copyright (C) 2005 Software in the Public Interest, Inc. # This file is distributed under the same license as apt. -# Itong tipunan ay ipinamamahagi sa parehong lisensya ng apt. +# Itong talaksan ay ipinapamahagi sa parehong lisensya ng apt. # Eric Pareja <xenos@upm.edu.ph>, 2005 # This file is maintained by Eric Pareja <xenos@upm.edu.ph> -# Itong tipunan ay inaalagaan ni Eric Pareja <xenos@upm.edu.ph> +# Itong talaksan ay inaalagaan ni Eric Pareja <xenos@upm.edu.ph> # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-09 16:36+0800\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-03-16 15:53+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" "MIME-Version: 1.0\n" @@ -22,18 +22,18 @@ msgstr "" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paketeng %s bersyon %s ay may di ayos na dep:\n" +msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "Di mahanap ang paketeng %s" +msgstr "Hindi mahanap ang paketeng %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "Kabuuang mga Pakete : " +msgstr "Kabuuan ng mga Pakete : " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " @@ -45,7 +45,7 @@ msgstr " Purong Birtwual na Pakete: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Mag-isang Birtwal na Pakete: " +msgstr " Nag-iisang Birtwal na Pakete: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@ -57,40 +57,40 @@ msgstr " Kulang/Nawawala: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "Kabuuang Kakaibang Bersyon: " +msgstr "Kabuuan ng Natatanging mga Bersyon: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "Kabuuang Dependensiya: " +msgstr "Kabuuan ng mga Dependensiya: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " -msgstr "Kabuuang Ber/Tipunan relasyon: " +msgstr "Kabuuan ng ugnayang Ber/Talaksan: " #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "Kabuuang Mapping ng Provides: " +msgstr "Kabuuan ng Mapping ng Provides: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Kabuuang Globbed String: " +msgstr "Kabuuan ng Globbed String: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "Kabuuang lugar ng Dependensiya Bersyon: " +msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Kabuuang Maluwag na lugar: " +msgstr "Kabuuan ng Hindi Nagamit na puwang: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "Kabuuang lugar na napag-tuosan: " +msgstr "Kabuuan ng puwang na napag-tuosan: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "Wala sa sync ang tipunang pakete %s." +msgstr "Wala sa sync ang talaksan ng paketeng %s." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" @@ -102,11 +102,11 @@ msgstr "Walang nahanap na mga pakete" #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "Tipunang Pakete:" +msgstr "Talaksang Pakete:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Wala sa sync ang cache, hindi ma-x-ref ang tipunang pakete" +msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" #: cmdline/apt-cache.cc:1470 #, c-format @@ -120,12 +120,12 @@ msgstr "Mga naka-Pin na Pakete:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "(di nahanap)" +msgstr "(hindi nahanap)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " Naka-instol: " +msgstr " Nakaluklok: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" @@ -150,14 +150,14 @@ msgstr " Talaang Bersyon:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -196,22 +196,22 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Pag-gamit: apt-cache [mga option] utos\n" -" apt-cache [mga option] add tipunan1 [tipunan2 ...]\n" +" apt-cache [mga option] add talaksan1 [talaksan2 ...]\n" " apt-cache [mga option] showpkg pkt1 [pkt2 ...]\n" " apt-cache [mga option] showsrc pkt1 [pkt2 ...]\n" "\n" "apt-cache ay isang kagamitang low-level para sa pag-manipula\n" -"ng mga tipunan sa binary cache ng APT, at upang makakuha ng\n" +"ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n" "impormasyon mula sa kanila\n" "\n" "Mga utos:\n" -" add - Magdagdag ng tipunang pakete sa source cache\n" +" add - Magdagdag ng talaksang pakete sa source cache\n" " gencaches - Buuin pareho ang cache ng pakete at source\n" " showpkg - Ipakita ang impormasyon tungkol sa isang pakete\n" " showsrc - Ipakita ang mga record ng source\n" " stats - Ipakita ang ilang mga estadistika\n" -" dump - Ipakita ang buong tipunan sa anyong maikli\n" -" dumpavail - Ipakita ang tipunang available sa stdout\n" +" dump - Ipakita ang buong talaksan sa anyong maikli\n" +" dumpavail - Ipakita ang talaksang available sa stdout\n" " unmet - Ipakita ang mga kulang na mga dependensiya\n" " search - Maghanap sa listahan ng mga pakete ng regex pattern\n" " show - Ipakita ang nababasang record ng pakete\n" @@ -227,16 +227,28 @@ msgstr "" " -h Itong tulong na ito.\n" " -p=? Ang cache ng mga pakete.\n" " -s=? Ang cache ng mga source.\n" -" -q Huwag ipakita ang indikator ng progreso.\n" +" -q Huwag ipakita ang hudyat ng progreso.\n" " -i Ipakita lamang ang importanteng mga dep para sa utos na unmet\n" -" -c=? Basahin ang tipunang pagkaayos na ito\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n" "karagdagang impormasyon\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Mga argumento ay hindi nakapares" +msgstr "Mga argumento ay hindi naka-pares" #: cmdline/apt-config.cc:76 msgid "" @@ -255,7 +267,7 @@ msgid "" msgstr "" "Pag-gamit: apt-config [mga option] utos\n" "\n" -"Ang apt-config ay simpleng kagamitan sa pagbasa ng tipunang pagkaayos\n" +"Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos\n" "ng APT\n" "\n" "Mga utos:\n" @@ -263,13 +275,13 @@ msgstr "" " dump - ipakita ang pagkaayos\n" "Mga option:\n" " -h Itong tulong na ito.\n" -" -c=? Basahin itong tipunang pagkaayos\n" +" -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s ay di tanggap na paketeng DEB." +msgstr "%s ay hindi balido na paketeng DEB." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -284,29 +296,29 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Pag-gamit: apt-extracttemplates tipunan1 [tipunan2 ...]\n" +"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" "\n" "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" "sa pagkaayos at template mula sa mga paketeng debian\n" "\n" -"Mga option:\n" +"Mga opsyon:\n" " -h Itong tulong na ito\n" " -t Itakda ang dir na pansamantala\n" -" -c=? Basahin ang tipunang pagkaayos na ito\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" -msgstr "Hindi makasulat sa %s" +msgstr "Hindi makapagsulat sa %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Hindi makuha ang bersyon ng debconf. Naka-instol ba ang debconf?" +msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Mahaba masyado ang talaang extensyon ng mga pakete" +msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 @@ -317,11 +329,11 @@ msgstr "Error sa pagproseso ng directory %s" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Mahaba masyado ang talaang extensyon ng pagkukunan (source)" +msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Error sa pagsulat ng header sa tipunang nilalaman (contents)" +msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" #: ftparchive/apt-ftparchive.cc:401 #, c-format @@ -329,7 +341,6 @@ msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,24 +389,27 @@ msgstr "" " generate config [mga grupo]\n" " clean config\n" "\n" -"Ang apt-ftparchive ay gumagawa ng tipunang index para sa arkibong Debian.\n" +"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n" "Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n" "at kapalit ng dpkg-scanpackages at dpkg-scansources\n" "\n" -"Bumubuo ang apt-ftparchive ng mga tipunang Package mula sa puno ng mga\n" -".deb. Ang tipunang Package ay naglalaman ng laman ng lahat ng control field\n" -"mula sa bawat pakete pati na rin ang MD5 hash at laki ng tipunan. Suportado\n" -"ang pag-gamit ng tipunang override upang pilitin ang halaga ng Priority at " +"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n" +".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control " +"field\n" +"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. " +"Suportado\n" +"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at " "Section.\n" "\n" -"Bumubuo din ang apt-ftparchive ng tipunang Sources mula sa puno ng mga\n" +"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n" ".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n" -"ang tipunang override ng src\n" +"ang talaksang override ng src\n" "\n" "Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n" "puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n" -"at ang tipunang override ay dapat naglalaman ng mga flag na override. Ang\n" -"pathprefix ay dinudugtong sa harap ng mga pangalan ng tipunan kung mayroon.\n" +"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n" +"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung " +"mayroon.\n" "Halimbawa ng pag-gamit mula sa arkibong Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -403,46 +417,46 @@ msgstr "" "Mga option:\n" " -h Itong tulong na ito\n" " --md5 Pagbuo ng MD5\n" -" -s=? Tipunang override ng source\n" +" -s=? Talaksang override ng source\n" " -q Tahimik\n" " -d=? Piliin ang optional caching database\n" " --no-delink Enable delinking debug mode\n" -" --contents Pagbuo ng tipunang contents\n" -" -c=? Basahin itong tipunang pagkaayos\n" +" --contents Pagbuo ng talaksang contents\n" +" -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Walang mga piniling nag-match" +msgstr "Walang mga pinili na tugma" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "May mga tipunang kulang sa grupong tipunang pakete `%s'" +msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Nasira ang DB, pinalitan ng pangalan ang tipunan sa %s.old" +msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Luma ang DB, sinusubukang i-apgreyd %s" +msgstr "Luma ang DB, sinusubukang maupgrade ang %s" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Hindi mabuksan ang tipunang DB %s: %s" +msgstr "Hindi mabuksan ang talaksang DB %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Nagbago ang petsa ng tipunan %s" +msgstr "Nagbago ang petsa ng talaksang %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Walang control record ang arkibo" +msgstr "Walang kontrol rekord ang arkibo" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -468,21 +482,21 @@ msgstr "W: " #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "E: Mga error ay tumutukoy sa tipunang " +msgstr "E: Mga error ay tumutukoy sa talaksang " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "Sawi sa pag-resolba %s" +msgstr "Bigo sa pag-resolba ng %s" #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "Sawi ang paglakad sa puno" +msgstr "Bigo ang paglakad sa puno" #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" -msgstr "Sawi ang pagbukas ng %s" +msgstr "Bigo ang pagbukas ng %s" #: ftparchive/writer.cc:245 #, c-format @@ -492,17 +506,17 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "Sawi ang pagbasa ng link %s" +msgstr "Bigo ang pagbasa ng link %s" #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "Sawi ang pag-unlink ng %s" +msgstr "Bigo ang pag-unlink ng %s" #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Sawi ang pag-link ng %s sa %s" +msgstr "*** Bigo ang pag-link ng %s sa %s" #: ftparchive/writer.cc:274 #, c-format @@ -510,24 +524,24 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" -msgstr "Sawi ang pag-stat ng %s" +msgstr "Bigo ang pag-stat ng %s" #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " Maintainer ng %s ay %s hindi %s\n" +msgstr " Tagapangalaga ng %s ay %s hindi %s\n" #: ftparchive/contents.cc:317 #, c-format @@ -536,7 +550,7 @@ msgstr "Internal error, hindi mahanap ang miyembrong %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Sawi ang pagreserba ng memory" +msgstr "realloc - Bigo ang pagreserba ng memory" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -561,12 +575,12 @@ msgstr "Maling anyo ng override %s linya %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Sawi ang pagbasa ng tipunang override %s" +msgstr "Bigo ang pagbasa ng talaksang override %s" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Di kilalang algorithmong compression '%s'" +msgstr "Hindi kilalang algorithmong compression '%s'" #: ftparchive/multicompress.cc:105 #, c-format @@ -575,15 +589,15 @@ msgstr "Kailangan ng compression set ang compressed output %s" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Sawi sa paglikha ng IPC pipe sa subprocess" +msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "Sawi ang paglikha ng FILE*" +msgstr "Bigo ang paglikha ng FILE*" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "Sawi ang pag-fork" +msgstr "Bigo ang pag-fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" @@ -592,15 +606,15 @@ msgstr "Anak para sa pag-Compress" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Error na Internal, Sawi ang paglikha ng %s" +msgstr "Error na internal, bigo ang paglikha ng %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Sawi ang paglikha ng subprocess IPC" +msgstr "Bigo ang paglikha ng subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Sawi ang pag-exec ng taga-compress" +msgstr "Bigo ang pag-exec ng taga-compress" #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -608,11 +622,11 @@ msgstr "taga-decompress" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Sawi ang IO sa subprocess/tipunan" +msgstr "Bigo ang IO sa subprocess/talaksan" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Sawi ang pagbasa habang tinutuos ang MD5" +msgstr "Bigo ang pagbasa habang tinutuos ang MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -622,230 +636,233 @@ msgstr "Problema sa pag-unlink ng %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Sawi ang pagpangalan muli ng %s tungong %s" +msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" -msgstr "ngunit %s ay naka-instol" +msgstr "ngunit ang %s ay nakaluklok" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" -msgstr "ngunit %s ay iinstolahin" +msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" -msgstr "ngunit hindi ito maaaring instolahin" +msgstr "ngunit hindi ito maaaring iluklok" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" -msgstr "ngunit ito ay hindi naka-instol" +msgstr "ngunit ito ay hindi nakaluklok" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" -msgstr "ngunit ito ay hindi iinstolahin" +msgstr "ngunit ito ay hindi iluluklok" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "Ang sumusunod na BAGONG mga pakete ay iinstolahin:" +msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "Ang susunod na mga pakete ay TATANGGALIN:" +msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "Ang susunod na mga pakete ay hinayaang maiwanan:" +msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "Ang susunod na mga pakete ay ia-apgreyd:" +msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" +"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu nai-upgrade, %lu bagong instol, " +msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "%lu ininstol muli, " +msgstr "%lu iniluklok muli, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu na tatanggalin at %lu na di inapgreyd.\n" +msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu na di lubos na na-instol o tinanggal.\n" +msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." -msgstr " ay sawi." +msgstr " ay bigo." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" +"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "Instolahin ang mga paketeng ito na walang beripikasyon [o/H]? " +msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" +"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "Internal error sa pagdagdag ng diversion" +msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" -msgstr "Di maaldaba ang directory ng download" +msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." +"org" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Matapos magbuklat ay %sB ng karagdagang lugar sa disk ay magagamit.\n" +msgstr "" +"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Matapos magbuklat %sB ng lugar sa disk ay mapapalaya.\n" +msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Kulang kayo ng libreng puwang sa %s" +msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "Kulang kayo ng libreng lugar sa %s." +msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@ -855,28 +872,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Sawi sa pagkuha ng %s %s\n" +msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" -msgstr "May mga tipunang hindi nakuha" +msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" -msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" +msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -884,48 +901,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n" +"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n" +msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" -msgstr " [Naka-instol]" +msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Dapat ninyong piliin ang isa na instolahin." +msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -933,79 +950,79 @@ msgid "" "is only available from another source\n" msgstr "" "Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n" -"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n" +"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n" +msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"May mga tipunang index na hindi nakuha, sila'y di pinansin, o ginamit ang " +"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1013,7 +1030,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1024,126 +1041,130 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n" -"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" +"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" +msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Kinakalkula ang upgrade... " +msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "Sawi" +msgstr "Bigo" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" +msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 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:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." -msgstr "Sawi sa pagkuha ng ilang mga arkibo." +msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, 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:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Sawi ang utos ng pagbuklat '%s'.\n" +msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Utos na build '%s' ay sawi.\n" +msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" -msgstr "Sawi ang prosesong anak" +msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 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:2096 +#: cmdline/apt-get.cc:2140 #, 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:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1173,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,32 +1182,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" +"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" +msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" -msgstr "Sawi sa pagproseso ng build dependencies" +msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1244,8 +1265,8 @@ msgstr "" " build-dep - Magsaayos ng build-dependencies para sa mga paketeng source\n" " dist-upgrade - Mag-upgrade ng pamudmod, basahin ang apt-get(8)\n" " dselect-upgrade - Sundan ang mga pinili sa dselect\n" -" clean - Burahin ang mga nakuhang mga tipunang naka-arkibo\n" -" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga tipunan\n" +" clean - Burahin ang mga nakuhang mga talaksang naka-arkibo\n" +" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan\n" " check - Tiyakin na walang mga sirang dependensiya\n" "\n" "Mga option:\n" @@ -1255,12 +1276,12 @@ msgstr "" " -d Kunin lamang - HINDI mag-instol o mag-buklat ng mga arkibo\n" " -s Walang gagawin. Mag-simulate lamang ang pagkasunod-sunod.\n" " -y Assume Yes to all queries and do not prompt\n" -" -f Subukang magpatuloy kung sawi ang pagsuri ng integridad\n" +" -f Subukang magpatuloy kung bigo ang pagsuri ng integridad\n" " -m Subukang magpatuloy kung hindi mahanap ang mga arkibo\n" " -u Ipakita rin ang listahan ng mga paketeng i-upgrade\n" " -b Ibuo ang paketeng source matapos kunin ito\n" " -V Ipakita ng buo ang bilang ng bersyon\n" -" -c=? Basahin itong tipunang pagkaayos\n" +" -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" "Basahin ang pahinang manwal ng apt-get(8), sources.list(5) at apt.conf(5)\n" "para sa karagdagang impormasyon at mga option.\n" @@ -1290,7 +1311,7 @@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [May Ginagawa]" +msgstr " [May ginagawa]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1320,16 +1341,16 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Pag-gamit: apt-sortpkgs [mga option] tipunan1 [tipunan2 ...]\n" +"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n" "\n" -"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng tipunang " +"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang " "pakete.\n" -"Ang option -s ay ginagamit upang ipaalam kung anong klaseng tipunan ito.\n" +"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n" "\n" "Mga option:\n" " -h Itong tulong na ito\n" -" -s Gamitin ang pag-sort ng tipunang source\n" -" -c=? Basahin ang tipunang pagkaayos na ito\n" +" -s Gamitin ang pag-sort ng talaksang source\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" #: dselect/install:32 @@ -1347,7 +1368,7 @@ msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble" +msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1359,7 +1380,7 @@ msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" "sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin " -"muli ang [I]nstol." +"muli ang [I]luklok/Instol." #: dselect/update:30 msgid "Merging available information" @@ -1367,11 +1388,11 @@ msgstr "Pinagsasama ang magagamit na impormasyon" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "Sawi sa paglikha ng mga pipe" +msgstr "Bigo sa paglikha ng mga pipe" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "Sawi sa pagtakbo ng gzip " +msgstr "Bigo sa pagtakbo ng gzip " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" @@ -1379,16 +1400,16 @@ msgstr "Sirang arkibo" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "Sawi ang checksum ng tar, sira ang arkibo" +msgstr "Bigo ang checksum ng tar, sira ang arkibo" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Di kilalang uri ng TAR header %u, miyembrong %s" +msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "Di tanggap na signature ng arkibo" +msgstr "Hindi tanggap na signature ng arkibo" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" @@ -1396,7 +1417,7 @@ msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Di tanggap na header ng miyembro ng arkibo" +msgstr "Hindi tanggap na header ng miyembro ng arkibo" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" @@ -1404,7 +1425,7 @@ msgstr "Bitin ang arkibo. Sobrang iksi." #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Sawi ang pagbasa ng header ng arkibo" +msgstr "Bigo ang pagbasa ng header ng arkibo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1412,11 +1433,11 @@ msgstr "Tinawagan ang DropNode sa naka-link pa na node" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Sawi sa paghanap ng elemento ng hash!" +msgstr "Bigo sa paghanap ng elemento ng hash!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Sawi ang pagreserba ng diversion" +msgstr "Bigo ang pagreserba ng diversion" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@ -1435,17 +1456,17 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Nadobleng tipunang conf %s/%s" +msgstr "Nadobleng talaksang conf %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Sawi sa pagsulat ng tipunang %s" +msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" -msgstr "Sawi sa pagsara ng tipunang %s" +msgstr "Bigo sa pagsara ng talaksang %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format @@ -1478,7 +1499,7 @@ msgstr "Ang directory %s ay papalitan ng hindi-directory" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Sawi ang paghanap ng node sa kanyang hash bucket" +msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1492,10 +1513,11 @@ msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ang tipunang %s/%s ay pumapatong sa isang tipunan sa paketeng %s" +msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -1508,7 +1530,7 @@ msgstr "Hindi ma-stat ang %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Sawi sa pagtanggal ng %s" +msgstr "Bigo sa pagtanggal ng %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1518,7 +1540,7 @@ msgstr "Hindi malikha ang %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Sawi sa pag-stat ng %sinfo" +msgstr "Bigo sa pag-stat ng %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" @@ -1534,16 +1556,16 @@ msgstr "Binabasa ang Listahan ng mga Pakete" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Sawi sa paglipat sa admin dir %sinfo" +msgstr "Bigo sa paglipat sa admin dir %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "Internal error sa pagkuha ng pangalan ng pakete" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" -msgstr "Binabasa ang Tipunang Listahan" +msgstr "Binabasa ang Talaksang Listahan" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1552,14 +1574,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Sawi sa pagbukas ng tipunang listahan '%sinfo/%s'. Kung hindi niyo maibalik " -"ang tipunang ito, gawin itong walang laman at muling instolahin kaagad ang " +"Bigo sa pagbukas ng talaksang listahan '%sinfo/%s'. Kung hindi niyo maibalik " +"ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang " "parehong bersyon ng pakete!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Sawi sa pagbasa ng tipunang listahan %sinfo/%s" +msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@ -1568,17 +1590,17 @@ msgstr "Internal error sa pagkuha ng Node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Sawi sa pagbukas ng tipunang diversions %sdiversions" +msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "Ang tipunang diversion ay sira" +msgstr "Ang talaksang diversion ay sira" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Di tanggap na linya sa tipunang diversion: %s" +msgstr "Di tanggap na linya sa talaksang diversion: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" @@ -1588,19 +1610,15 @@ msgstr "Internal error sa pagdagdag ng diversion" msgid "The pkg cache must be initialized first" msgstr "Ang cache ng pkg ay dapat ma-initialize muna" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Binabasa ang Tipunang Listahan" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Sawi sa paghanap ng Pakete: Header, offset %lu" +msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Maling ConfFile section sa tipunang status. Offset %lu" +msgstr "Maling ConfFile section sa talaksang status. Offset %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1629,11 +1647,11 @@ msgstr "Internal error, hindi mahanap ang miyembro" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Sawi sa paghanap ng tanggap na tipunang control" +msgstr "Bigo sa paghanap ng tanggap na talaksang control" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Di maintindihang tipunang control" +msgstr "Di maintindihang talaksang control" #: methods/cdrom.cc:114 #, c-format @@ -1658,22 +1676,21 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Hindi Nahanap ang Tipunan" +msgstr "Hindi nahanap ang Disk." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Hindi Nahanap ang Tipunan" +msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" -msgstr "Sawi ang pag-stat" +msgstr "Bigo ang pag-stat" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Sawi ang pagtakda ng oras ng pagbago" +msgstr "Bigo ang pagtakda ng oras ng pagbago" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1700,12 +1717,12 @@ msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Sawi ang USER/GUMAGAMIT, sabi ng server ay: %s" +msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Sawi ang PASS, sabi ng server ay: %s" +msgstr "Bigo ang PASS, sabi ng server ay: %s" #: methods/ftp.cc:237 msgid "" @@ -1718,12 +1735,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Sawi ang utos sa login script '%s', sabi ng server ay: %s" +msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Sawi ang TYPE, sabi ng server ay: %s" +msgstr "Bigo ang TYPE, sabi ng server ay: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1789,7 +1806,7 @@ msgstr "Di kilalang pamilya ng address %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Sawi ang EPRT, sabi ng server ay: %s" +msgstr "Bigo ang EPRT, sabi ng server ay: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@ -1799,14 +1816,14 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problema sa pag-hash ng tipunan" +msgstr "Problema sa pag-hash ng talaksan" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Hindi makakuha ng tipunan, sabi ng server ay '%s'" +msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1815,14 +1832,14 @@ msgstr "Nag-timeout ang socket ng datos" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Sawi ang paglipat ng datos, sabi ng server ay '%s'" +msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Query" +msgstr "Tanong" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Hindi ma-invoke " @@ -1851,75 +1868,80 @@ msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Hindi maka-konek sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kumokonek sa %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Pansamantalang kasawian sa pagresolba ng '%s'" +msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Hindi maka-konek sa %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Hindi maresolba ang '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " +"Lalabas." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " +"fingerprint?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "hindi makuha ang aldaba %s" +msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" +msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " +"available:\n" #: methods/gzip.cc:57 #, c-format @@ -1931,89 +1953,89 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s" msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" -msgstr "Naghihintay ng mga header" +msgstr "Naghihintay ng panimula" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter" +msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" -msgstr "Maling linyang header" +msgstr "Maling linyang panimula" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" -msgstr "Sawi ang pagpili" +msgstr "Bigo ang pagpili" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" -msgstr "Error sa pagsulat ng tipunang output" +msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" -msgstr "Error sa pagsulat sa tipunan" +msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" -msgstr "Error sa pagsusulat sa tipunan" +msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" -msgstr "Maling datos sa header" +msgstr "Maling datos sa panimula" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" -msgstr "Sawi ang koneksyon" +msgstr "Bigo ang koneksyon" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "Internal na error" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "Hindi mai-mmap ang tipunang walang laman" +msgstr "Hindi mai-mmap ang talaksang walang laman" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" @@ -2026,7 +2048,7 @@ msgstr "Hindi kilalang katagang uri: '%c'" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "Binubuksan ang tipunang pagsasaayos %s" +msgstr "Binubuksan ang talaksang pagsasaayos %s" #: apt-pkg/contrib/configuration.cc:512 #, c-format @@ -2072,7 +2094,7 @@ msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntax error %s:%u: May basura sa dulo ng tipunan" +msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" #: apt-pkg/contrib/progress.cc:154 #, c-format @@ -2087,40 +2109,40 @@ msgstr "%c%s... Tapos" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Option sa command line '%c' [mula %s] ay di kilala." +msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "Option sa command line %s ay di naintindihan." +msgstr "Opsyon sa command line %s ay di naintindihan." #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "Option sa command line %s ay hindi boolean" +msgstr "Opsyon sa command line %s ay hindi boolean" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "Option %s ay nangangailangan ng argumento" +msgstr "Opsyon %s ay nangangailangan ng argumento" #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " +"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " "=<halaga>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'" +msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option '%s' ay labis ang haba" +msgstr "Opsyon '%s' ay labis ang haba" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2137,31 +2159,32 @@ msgstr "Di tanggap na operasyon %s" msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Sawi sa pag-stat ng cdrom" +msgstr "Bigo sa pag-stat ng cdrom" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"Hindi ginagamit ang pagaldaba para sa basa-lamang na tipunang aldaba %s" +"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "Hindi mabuksan ang tipunang aldaba %s" +msgstr "Hindi mabuksan ang talaksang aldaba %s" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Hindi gumagamit ng pag-aldaba para sa tipunang aldaba %s na naka-mount sa nfs" +"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " +"nfs" #: apt-pkg/contrib/fileutl.cc:109 #, c-format @@ -2191,7 +2214,7 @@ msgstr "Ang sub-process %s ay lumabas ng di inaasahan" #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "Hindi mabuksan ang tipunang %s" +msgstr "Hindi mabuksan ang talaksang %s" #: apt-pkg/contrib/fileutl.cc:492 #, c-format @@ -2205,15 +2228,15 @@ msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "Problema sa pagsara ng tipunan" +msgstr "Problema sa pagsara ng talaksan" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Problema sa pag-unlink ng tipunan" +msgstr "Problema sa pag-unlink ng talaksan" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "Problema sa pag-sync ng tipunan" +msgstr "Problema sa pag-sync ng talaksan" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@ -2221,11 +2244,11 @@ msgstr "Walang laman ang cache ng pakete" #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "Sira ang tipunan ng cache ng pakete" +msgstr "Sira ang talaksan ng cache ng pakete" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "Ang tipunan ng cache ng pakete ay hindi magamit na bersyon" +msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" #: apt-pkg/pkgcache.cc:142 #, c-format @@ -2254,7 +2277,7 @@ msgstr "Rekomendado" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "Conflict" +msgstr "Tunggali" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" @@ -2296,65 +2319,65 @@ msgstr "Bersyong Kandidato" msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Hindi ma-parse ang tipunang pakete %s (1)" +msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Hindi ma-parse ang tipunang pakete %s (2)" +msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s." +msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (uri)" +msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Di kilalang uri '%s' sa linyang %u sa tipunang pagkukunan %s" +msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (vendor id)" +msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2371,7 +2394,7 @@ msgstr "" #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Hindi suportado ang uri ng tipunang index na '%s'" +msgstr "Hindi suportado ang uri ng talaksang index na '%s'" #: apt-pkg/algorithms.cc:241 #, c-format @@ -2404,10 +2427,17 @@ msgstr "Nawawala ang directory ng talaan %spartial." msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Binabasa ang Talaksang Listahan" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2420,19 +2450,17 @@ msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" -" '%s'\n" -"sa drive '%s' at pindutin ang enter\n" +"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@ -2448,7 +2476,7 @@ msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng tipunang estado." +"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" @@ -2458,7 +2486,7 @@ msgstr "" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" -msgstr "Di tanggap na record sa tipunang pagtatangi, walang Package header" +msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" #: apt-pkg/policy.cc:291 #, c-format @@ -2544,7 +2572,7 @@ msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" #: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" -msgstr "Kinukuha ang Tipunang Provides" +msgstr "Kinukuha ang Talaksang Provides" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" @@ -2553,39 +2581,43 @@ msgstr "IO Error sa pag-imbak ng source cache" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)." +msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n" + +#: apt-pkg/acquire-item.cc:753 #, 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 "" -"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " +"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:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " +"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " +"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2632,7 +2664,7 @@ msgstr "Sinasalang ang CD-ROM...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "Sinisiyasat ang Disc para sa tipunang index...\n" +msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" #: apt-pkg/cdrom.cc:647 #, c-format @@ -2678,73 +2710,86 @@ msgstr "Nagsulat ng %i na record.\n" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "Nagsulat ng %i na record na may %i na tipunang kulang.\n" +msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Nagsulat ng %i na record na may %i na tipunang mismatch\n" +msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Nagsulat ng %i na record na may %i na tipunang kulang at %i na tipunang " +"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Binubuksan %s" +msgstr "Hinahanda ang %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Binubuksan %s" +msgstr "Binubuklat ang %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Binubuksan ang tipunang pagsasaayos %s" +msgstr "Hinahanda ang %s upang isaayos" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Kumokonek sa %s" +msgstr "Isasaayos ang %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Naka-instol: " +msgstr "Iniluklok ang %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Naghahanda para sa pagtanggal ng %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Binubuksan %s" +msgstr "Tinatanggal ang %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Rekomendado" +msgstr "Tinanggal ang %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Hinahanda ang %s upang isaayos" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Bigo sa pagtanggal ng %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ msgid "Reading file list" +#~ msgstr "Binabasa ang Talaksang Listahan" + +#~ msgid "Could not execute " +#~ msgstr "Hindi ma-execute ang " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito" + +#~ msgid "Removed with config %s" +#~ msgstr "Tinanggal ang %s kasama ang pagkasaayos nito" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s" +#~ msgstr "" +#~ "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s" diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 000000000..4578c8234 --- /dev/null +++ b/po/vi.po @@ -0,0 +1,2809 @@ +# Vietnamese Translation for Apt. +# This file is put in the public domain. +# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: apt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-01-22 13:04+1030\n" +"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" +"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.6b30\n" + +#: cmdline/apt-cache.cc:135 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n" + +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1508 +#, c-format +msgid "Unable to locate package %s" +msgstr "Không thể định vị gói %s" + +#: cmdline/apt-cache.cc:232 +msgid "Total package names : " +msgstr "Tổng tên gói: " + +#: cmdline/apt-cache.cc:272 +msgid " Normal packages: " +msgstr " Gói bình thường: " + +#: cmdline/apt-cache.cc:273 +msgid " Pure virtual packages: " +msgstr " Gói ảo nguyên chất: " + +#: cmdline/apt-cache.cc:274 +msgid " Single virtual packages: " +msgstr " Gói ảo đơn: " + +#: cmdline/apt-cache.cc:275 +msgid " Mixed virtual packages: " +msgstr " Gói ảo đã pha trộn: " + +#: cmdline/apt-cache.cc:276 +msgid " Missing: " +msgstr " Thiếu: " + +#: cmdline/apt-cache.cc:278 +msgid "Total distinct versions: " +msgstr "Tổng phiên bản riêng: " + +#: cmdline/apt-cache.cc:280 +msgid "Total dependencies: " +msgstr "Tổng cách phụ thuộc: " + +#: cmdline/apt-cache.cc:283 +msgid "Total ver/file relations: " +msgstr "Tổng cách liên quan phiên bản và tập tin: " + +#: cmdline/apt-cache.cc:285 +msgid "Total Provides mappings: " +msgstr "Tổng cách ảnh xạ Miễn là: " + +#: cmdline/apt-cache.cc:297 +msgid "Total globbed strings: " +msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: " + +#: cmdline/apt-cache.cc:311 +msgid "Total dependency version space: " +msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: " + +#: cmdline/apt-cache.cc:316 +msgid "Total slack space: " +msgstr "Tổng chỗ chưa dùng: " + +#: cmdline/apt-cache.cc:324 +msgid "Total space accounted for: " +msgstr "Tổng chỗ sẽ dùng: " + +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#, c-format +msgid "Package file %s is out of sync." +msgstr "Tập tin gói %s không đồng bộ được." + +#: cmdline/apt-cache.cc:1231 +msgid "You must give exactly one pattern" +msgstr "Bạn phải đưa ra đúng một mẫu" + +#: cmdline/apt-cache.cc:1385 +msgid "No packages found" +msgstr "Không tìm thấy gói" + +#: cmdline/apt-cache.cc:1462 +msgid "Package files:" +msgstr "Tập tin gói:" + +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" +"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" + +# Variable: do not translate/ biến: đừng dịch +#: cmdline/apt-cache.cc:1470 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1482 +msgid "Pinned packages:" +msgstr "Các gói đã ghim:" + +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +msgid "(not found)" +msgstr "(không tìm thấy)" + +#. Installed version +#: cmdline/apt-cache.cc:1515 +msgid " Installed: " +msgstr " Đã cài đặt: " + +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +msgid "(none)" +msgstr "(không có)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1522 +msgid " Candidate: " +msgstr " Ứng cử: " + +#: cmdline/apt-cache.cc:1532 +msgid " Package pin: " +msgstr " Ghim gói: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1541 +msgid " Version table:" +msgstr " Bảng phiên bản:" + +# Variable: do not translate/ biến: đừng dịch +#: cmdline/apt-cache.cc:1556 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" + +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s %s compiled on %s %s\n" +msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" + +#: cmdline/apt-cache.cc:1659 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n" +" apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n" +" apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n" +" apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n" +"(cache: \tbộ nhớ tạm;\n" +"add: \tthêm;\n" +"showpkg: hiển thị gói;\n" +"showsrc: \thiển thị nguồn)\n" +"\n" +"apt-cache là một công cụ mức thấp dùng để thao tác\n" +"những tập tin bộ nhớ tạm nhị phân của APT,\n" +"và cũng để truy vấn thông tin từ những tập tin đó.\n" +"\n" +"Lệnh:\n" +" add\t\t_Thêm_ gói vào bộ nhớ tạm nguồn\n" +" gencaches\tXây dung (_tạo ra_) cả gói lẫn _bộ nhớ tạm_ nguồn đều\n" +" showpkg\t_Hiện_ một phần thông tin chung về một _gói_ riêng lẻ\n" +" showsrc\t_Hiện_ các mục ghi _nguồn_\n" +" stats\t\tHiện một phần _thống kê_ cơ bản\n" +" dump\t\tHiện toàn bộ tập tin dạng ngắn (_đổ_)\n" +" dumpavail\tIn ra một tập tin _sẵn sàng_ vào thiết bị xuất chuẩn (_đổ_)\n" +" unmet\t\tHiện các cách phụ thuộc _chưa thực hiện_\n" +" search\t\t_Tìm kiếm_ mẫu biểu thức chính quy trong danh sách gói\n" +" show\t\t_Hiệnị_ mục ghi có thể đọc, cho những gói đó\n" +" depends\tHiện thông tin cách _phụ thuộc_ thô cho gói\n" +" rdepends\tHiện thông tin cách _phụ thuộc ngược lại_, cho gói\n" +" pkgnames\tHiện danh sách _tên_ mọi _gói_\n" +" dotty\t\tTạo ra đồ thị gói cho GraphVis (_nhiều chấm_)\n" +" xvcg\t\tTạo ra đồ thị gói cho _xvcg_\n" +" policy\t\tHiển thị các thiết lập _chính thức_\n" +"\n" +"Tùy chọn:\n" +" -h \t\t_Trợ giúp_ này\n" +" -p=? \t\tBộ nhớ tạm _gói_.\n" +" -s=? \t\tBộ nhớ tạm _nguồn_.\n" +" -q \t\tTắt cái chỉ tiến trình (_im_).\n" +" -i \t\tHiện chỉ những cách phụ thuộc _quan trọng_\n" +"\t\t\tcho lệnh chưa thực hiện.\n" +" -c=? \t\tĐọc tập tin _cấu hình_ này\n" +" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" +"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n" +"\t\t\tapt-cache(8) và apt.conf(5).\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Hãy cung cấp tên cho Đĩa này, như « Debian 2.1r1 Đĩa 1 »" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn." + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Không có các đối số dạng cặp" + +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách sử dụng: apt-config [tùy_chọn...] lệnh\n" +"\n" +"[config: viết tắt cho từ configuration: cấu hình]\n" +"\n" +"apt-config là một công cụ đơn giản để đọc tập tin cấu hình APT.\n" +"\n" +"Lệnh:\n" +" shell\t\tChế độ _hệ vỏ_\n" +" dump\t\tHiển thị cấu hình (_đổ_)\n" +"\n" +"Tùy chọn:\n" +" -h \t\t_Trợ giúp_ này\n" +" -c=? \t\tĐọc tập tin cấu hình này\n" +" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s không phải là một gói DEB hợp lệ." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: \t\trút;\n" +"templates: \tnhững biểu mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h \t\t_Trợ giúp_ này\n" +" -t \t\tLập thư muc tạm thời\n" +"\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n" +" -c=? \t\tĐọc tập tin cấu hình này\n" +" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#, c-format +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" + +#: cmdline/apt-extracttemplates.cc:310 +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:167 ftparchive/apt-ftparchive.cc:341 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" + +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#, c-format +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %s" + +#: ftparchive/apt-ftparchive.cc:254 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" + +#: ftparchive/apt-ftparchive.cc:371 +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:401 +#, c-format +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" + +#: ftparchive/apt-ftparchive.cc:556 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Cách sử dụng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: \tpackages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" \tsources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" \tcontents path\n" +" \trelease path\n" +" \tgenerate config [groups]\n" +" \tclean config\n" +"\n" +"[packages: \tnhững gói;\n" +"binarypath: \tđường dẫn nhị phân;\n" +"sources: \t\tnhững nguồn;\n" +"srcpath: \t\tđường dẫn nguồn;\n" +"contents path: đường dẫn nội dụng;\n" +"release path: \tđường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [nhóm];\n" +"clean config: \tcấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động toàn bộ\n" +"đến cách thay thế điều hoặt động cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn « --source-override » (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lnh « packages » (gói) và « sources » (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h \t\t_Trợ giúp_ này\n" +" --md5 \t\tĐiều khiển cách tạo ra MD5\n" +" -s=? \t\tTập tin đè nguồn\n" +" -q \t\t_Im_ (không xuất chi tiết)\n" +" -d=? \t\tChọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink \tMở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents \tĐiều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? \t\tĐọc tập tin cấu hình này\n" +" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »" + +#: ftparchive/apt-ftparchive.cc:762 +msgid "No selections matched" +msgstr "Không có điều đã chọn khớp được" + +#: ftparchive/apt-ftparchive.cc:835 +#, 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:45 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)." + +#: ftparchive/cachedb.cc:63 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" + +#: ftparchive/cachedb.cc:73 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." + +#: ftparchive/cachedb.cc:114 +#, c-format +msgid "File date has changed %s" +msgstr "Ngày tập tin đã đổi %s" + +#: ftparchive/cachedb.cc:155 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" + +#: ftparchive/cachedb.cc:267 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con chạy" + +#: ftparchive/writer.cc:78 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Không thể đọc thư mục %s\n" + +#: ftparchive/writer.cc:83 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n" + +#: ftparchive/writer.cc:125 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:127 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:134 +msgid "E: Errors apply to file " +msgstr "E: có lỗi áp dụng vào tập tin " + +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#, c-format +msgid "Failed to resolve %s" +msgstr "Việc quyết định %s bị lỗi" + +#: ftparchive/writer.cc:163 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" + +#: ftparchive/writer.cc:188 +#, c-format +msgid "Failed to open %s" +msgstr "Việc mở %s bị lỗi" + +#: ftparchive/writer.cc:245 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" + +#: ftparchive/writer.cc:253 +#, c-format +msgid "Failed to readlink %s" +msgstr "Việc tạo liên kết lại %s bị lỗi" + +#: ftparchive/writer.cc:257 +#, c-format +msgid "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" + +#: ftparchive/writer.cc:264 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Việc liên kết %s đến %s bị lỗi" + +#: ftparchive/writer.cc:274 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" + +#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 +#, c-format +msgid "Failed to stat %s" +msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" + +#: ftparchive/writer.cc:386 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" + +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè\n" + +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo quản %s là %s không phải %s\n" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +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" + +#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#, c-format +msgid "Unable to open %s" +msgstr "Không thể mở %s" + +#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "Điều đè dạng sai %s dòng %lu #1" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "Điều đè dạng sai %s dòng %lu #2" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "Điều đè dạng sai %s dòng %lu #3" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén « %s »" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "Việc tạo tiến trình con bị lỗi" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "Nén điều con" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, việc tạo %s bị lỗi" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "Việc thực hiện bô nén bị lỗi " + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "bộ giải nén" + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "Việc đọc khi tính MD5 bị lỗi" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" + +#: cmdline/apt-get.cc:120 +msgid "Y" +msgstr "C" + +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Lỗi biên dich biểu thức chính quy - %s" + +#: cmdline/apt-get.cc:237 +msgid "The following packages have unmet dependencies:" +msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :" + +#: cmdline/apt-get.cc:327 +#, c-format +msgid "but %s is installed" +msgstr "nhưng mà %s đã được cài đặt" + +#: cmdline/apt-get.cc:329 +#, c-format +msgid "but %s is to be installed" +msgstr "nhưng mà %s sẽ được cài đặt" + +#: cmdline/apt-get.cc:336 +msgid "but it is not installable" +msgstr "nhưng mà nó không có khả năng cài đặt" + +#: cmdline/apt-get.cc:338 +msgid "but it is a virtual package" +msgstr "nhưng mà nó là gói ảo" + +#: cmdline/apt-get.cc:341 +msgid "but it is not installed" +msgstr "nhưng mà nó chưa được cài đặt" + +#: cmdline/apt-get.cc:341 +msgid "but it is not going to be installed" +msgstr "nhưng mà nó sẽ không được cài đặt" + +#: cmdline/apt-get.cc:346 +msgid " or" +msgstr " hay" + +#: cmdline/apt-get.cc:375 +msgid "The following NEW packages will be installed:" +msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" + +#: cmdline/apt-get.cc:401 +msgid "The following packages will be REMOVED:" +msgstr "Theo đây có những gói sẽ bị GỠ BỎ :" + +#: cmdline/apt-get.cc:423 +msgid "The following packages have been kept back:" +msgstr "Theo đây có những gói đã được giữ lại:" + +#: cmdline/apt-get.cc:444 +msgid "The following packages will be upgraded:" +msgstr "Theo đây có những gói sẽ được nâng cấp:" + +#: cmdline/apt-get.cc:465 +msgid "The following packages will be DOWNGRADED:" +msgstr "Theo đây có những gói sẽ được HẠ CẤP:" + +#: cmdline/apt-get.cc:485 +msgid "The following held packages will be changed:" +msgstr "Theo đây có những gói sẽ được thay đổi:" + +#: cmdline/apt-get.cc:538 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (do %s) " + +#: cmdline/apt-get.cc:546 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n" +"ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác." + +#: cmdline/apt-get.cc:577 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu đã nâng cấp, %lu mới được cài đặt, " + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu được cài đặt lại, " + +#: cmdline/apt-get.cc:583 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu được hạ cấp, " + +#: cmdline/apt-get.cc:585 +#, 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" + +#: cmdline/apt-get.cc:589 +#, 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" + +#: cmdline/apt-get.cc:649 +msgid "Correcting dependencies..." +msgstr "Đang sửa cách phụ thuộc..." + +#: cmdline/apt-get.cc:652 +msgid " failed." +msgstr " đã thất bại." + +#: cmdline/apt-get.cc:655 +msgid "Unable to correct dependencies" +msgstr "Không thể sửa cách phụ thuộc" + +#: cmdline/apt-get.cc:658 +msgid "Unable to minimize the upgrade set" +msgstr "Không thể cực tiểu hóa bộ nâng cấp" + +#: cmdline/apt-get.cc:660 +msgid " Done" +msgstr " Đã xong" + +#: cmdline/apt-get.cc:664 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết." + +#: cmdline/apt-get.cc:667 +msgid "Unmet dependencies. Try using -f." +msgstr "" +"Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy " +"chọn « -f »." + +#: cmdline/apt-get.cc:689 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "CẢNH BÁO : không thể xác thực những gói theo đây." + +#: cmdline/apt-get.cc:693 +msgid "Authentication warning overridden.\n" +msgstr "Cảnh báo xác thực bị đè.\n" + +#: cmdline/apt-get.cc:700 +msgid "Install these packages without verification [y/N]? " +msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] " + +#: cmdline/apt-get.cc:702 +msgid "Some packages could not be authenticated" +msgstr "Một số gói không thể được xác thực" + +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +msgid "There are problems and -y was used without --force-yes" +msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »" + +#: cmdline/apt-get.cc:755 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." + +#: cmdline/apt-get.cc:764 +msgid "Packages need to be removed but remove is disabled." +msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt." + +#: cmdline/apt-get.cc:775 +msgid "Internal error, Ordering didn't finish" +msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" + +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +msgid "Unable to lock the download directory" +msgstr "Không thể khóa thư mục tải về" + +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: apt-pkg/cachefile.cc:67 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." + +#: cmdline/apt-get.cc:816 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>" + +#: cmdline/apt-get.cc:821 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Cần phải lấy %sB/%sB kho.\n" + +#: cmdline/apt-get.cc:824 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Cần phải lấy %sB kho.\n" + +#: cmdline/apt-get.cc:829 +#, c-format +msgid "After unpacking %sB of additional disk space will be used.\n" +msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" + +#: cmdline/apt-get.cc:832 +#, c-format +msgid "After unpacking %sB disk space will be freed.\n" +msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" + +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "Không thể quyết định chỗ rảnh trong %s" + +#: cmdline/apt-get.cc:849 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s." + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể." + +#: cmdline/apt-get.cc:866 +msgid "Yes, do as I say!" +msgstr "Có, làm đi." + +#: cmdline/apt-get.cc:868 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Bạn sắp làm gì có thể có hai.\n" +"Để tiếp tục thì hãy gõ cụm từ « %s »\n" +"?]" + +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +msgid "Abort." +msgstr "Hủy bỏ." + +#: cmdline/apt-get.cc:889 +msgid "Do you want to continue [Y/n]? " +msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " + +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Việc gói %s bị lỗi %s\n" + +#: cmdline/apt-get.cc:979 +msgid "Some files failed to download" +msgstr "Một số tập tin không tải về được" + +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +msgid "Download complete and in download only mode" +msgstr "Mới tải về xong và trong chế độ chỉ tải về" + +#: cmdline/apt-get.cc:986 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy " +"cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?" + +#: cmdline/apt-get.cc:990 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi " +"phương tiện." + +#: cmdline/apt-get.cc:995 +msgid "Unable to correct missing packages." +msgstr "Không thể sửa những gói còn thiếu." + +#: cmdline/apt-get.cc:996 +msgid "Aborting install." +msgstr "Đang hủy bỏ cài đặt." + +#: cmdline/apt-get.cc:1030 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Ghi chú : đang chọn %s thay vì %s\n" + +#: cmdline/apt-get.cc:1040 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" + +#: cmdline/apt-get.cc:1058 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n" + +#: cmdline/apt-get.cc:1069 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Gói %s là gói ảo được cung cấp do :\n" + +#: cmdline/apt-get.cc:1081 +msgid " [Installed]" +msgstr " [Đã cài đặt]" + +#: cmdline/apt-get.cc:1086 +msgid "You should explicitly select one to install." +msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." + +#: cmdline/apt-get.cc:1091 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"Gói %s không phải sẵn sàng, nhưng mà một gói khác\n" +"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n" +"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n" + +#: cmdline/apt-get.cc:1110 +msgid "However the following packages replace it:" +msgstr "Tuy nhiên, những gói theo đây thay thế nó :" + +#: cmdline/apt-get.cc:1113 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Gói %s không có ứng cử cài đặt" + +#: cmdline/apt-get.cc:1133 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" + +#: cmdline/apt-get.cc:1141 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s là phiên bản mơi nhất.\n" + +#: cmdline/apt-get.cc:1168 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Không tìm thấy bản phát hành « %s » cho « %s »" + +#: cmdline/apt-get.cc:1170 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Không tìm thấy phiên bản « %s » cho « %s »" + +#: cmdline/apt-get.cc:1176 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Đã chọn phiên bản %s (%s) cho %s\n" + +#: cmdline/apt-get.cc:1313 +msgid "The update command takes no arguments" +msgstr "Lệnh cập nhật không chấp nhật đối số" + +#: cmdline/apt-get.cc:1326 +msgid "Unable to lock the list directory" +msgstr "Không thể khóa thư mục danh sách" + +#: cmdline/apt-get.cc:1384 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được " +"dùng thay thế." + +#: cmdline/apt-get.cc:1403 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" + +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#, c-format +msgid "Couldn't find package %s" +msgstr "Không tìm thấy gói %s" + +#: cmdline/apt-get.cc:1516 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" + +#: cmdline/apt-get.cc:1546 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" + +#: cmdline/apt-get.cc:1549 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f " +"install » mà không có gói nào (hoặc ghi rõ cách quyết định)." + +#: cmdline/apt-get.cc:1561 +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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Không thể cài đặt một số gói. Có lẽ có nghĩa là bạn đa yêu cầu\n" +"một trường hợp không thể, hoặc nếu bạn sử dụng bản phân phối\n" +"bất định, có lẽ chưa tạo một số gói cần thiết,\n" +"hoặc chưa di chuyển chúng ra phần Incoming (Đến)." + +#: cmdline/apt-get.cc:1569 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." +msgstr "" +"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n" +"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" +"thông báo lỗi về gói này." + +#: cmdline/apt-get.cc:1574 +msgid "The following information may help to resolve the situation:" +msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" + +#: cmdline/apt-get.cc:1577 +msgid "Broken packages" +msgstr "Gói bị ngắt" + +#: cmdline/apt-get.cc:1603 +msgid "The following extra packages will be installed:" +msgstr "Những gói thêm theo đây sẽ được cài đặt:" + +#: cmdline/apt-get.cc:1674 +msgid "Suggested packages:" +msgstr "Gói được đệ nghị:" + +#: cmdline/apt-get.cc:1675 +msgid "Recommended packages:" +msgstr "Gói được khuyên:" + +#: cmdline/apt-get.cc:1695 +msgid "Calculating upgrade... " +msgstr "Đang tính nâng cấp... " + +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +msgid "Failed" +msgstr "Bị lỗi" + +#: cmdline/apt-get.cc:1703 +msgid "Done" +msgstr "Xong" + +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +msgid "Internal error, problem resolver broke stuff" +msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" + +#: cmdline/apt-get.cc:1876 +msgid "Must specify at least one package to fetch source for" +msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" + +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Không tìm thấy gói nguồn cho %s" + +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" + +#: cmdline/apt-get.cc:1974 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Không đủ sức chứa còn rảnh trong %s" + +#: cmdline/apt-get.cc:1979 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" + +#: cmdline/apt-get.cc:1982 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Cần phải lấy %sB kho nguồn.\n" + +#: cmdline/apt-get.cc:1988 +#, c-format +msgid "Fetch source %s\n" +msgstr "Lấy nguồn %s\n" + +#: cmdline/apt-get.cc:2019 +msgid "Failed to fetch some archives." +msgstr "Việc lấy một số kho bị lỗi." + +#: cmdline/apt-get.cc:2047 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" + +#: cmdline/apt-get.cc:2059 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Lệnh giải nén « %s » bị lỗi.\n" + +#: cmdline/apt-get.cc:2060 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" + +#: cmdline/apt-get.cc:2077 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Lệnh xây dụng « %s » bị lỗi.\n" + +#: cmdline/apt-get.cc:2096 +msgid "Child process failed" +msgstr "Tiến trình con bị lỗi" + +#: cmdline/apt-get.cc:2112 +msgid "Must specify at least one package to check builddeps for" +msgstr "" +"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" + +#: cmdline/apt-get.cc:2140 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" + +#: cmdline/apt-get.cc:2160 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" + +#: cmdline/apt-get.cc:2212 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" + +#: cmdline/apt-get.cc:2264 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " +"của gói %s có thể thỏa điều kiện phiên bản." + +#: cmdline/apt-get.cc:2299 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" + +#: cmdline/apt-get.cc:2324 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." + +#: cmdline/apt-get.cc:2338 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." + +#: cmdline/apt-get.cc:2342 +msgid "Failed to process build dependencies" +msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" + +#: cmdline/apt-get.cc:2374 +msgid "Supported modules:" +msgstr "Mô-đun đã hỗ trợ :" + +#: cmdline/apt-get.cc:2415 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Cách sử dụng: apt-get [tùy_chọn...] lệnh\n" +" apt-get [tùy_chọn...] install|remove gói1 [gói2 ...]\n" +" apt-get [tùy_chọn...] source gói1 [gói2 ...]\n" +"\n" +"[get: \tlấy\n" +"install: \tcài đặt\n" +"remove: \tgỡ bỏ\n" +"source: \tnguồn]\n" +"\n" +"apt-get là một giao diện dòng lệnh đơn giản để tải về và cài đặt gói.\n" +"Những lệnh đã dùng thường nhất là update (cập nhật) và install (cài đặt).\n" +"\n" +"Lệnh:\n" +" update\t\tLấy danh sách gói mới (_cập nhật_)\n" +" upgrade \t_Nâng cập_ \n" +" install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n" +" remove \t_Gỡ bỏ_ gói\n" +" source \t\tTải về kho _nguồn_\n" +" build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n" +" dist-upgrade \t_Nâng cấp bản phân phối_,\n" +"\t\t\t\t\thãy xem trang hướng dẫn (man) apt-get(8)\n" +" dselect-upgrade \t\tTheo cách chọn dselect (_nâng cấp_)\n" +" clean \t\tXóa bỏ các tập tin kho đã tải về (_làm sạch_)\n" +" autoclean \tXóa bỏ các tập tin kho cũ đã tải về (_tự động làm sạch_)\n" +" check \t\t_Kiểm chứng_ không có cách phụ thuộc bị ngắt\n" +"\n" +"Tùy chọn:\n" +" -h \t_Trợ giúp_ này.\n" +" -q \tDữ liệu xuất có thể ghi lưu - không có cái chỉ tiến trình (_im_)\n" +" -qq \tKhông xuất thông tin nào, trừ lỗi (_im im_)\n" +" -d \tChỉ _tải về_, ĐỪNG cài đặt hay giải nén kho\n" +" -s \tKhông hoạt đông. _Mô phỏng_ sắp xếp\n" +" -y \tGiả sử trả lời _Có_ (yes) mọi khi gặp câu hỏi;\n" +"\t\t\t\t\tđừng nhắc người dùng gõ gì\n" +" -f \t\tCố tiếp tục lại nếu việc kiểm tra tính nguyên vẹn _thất bại_\n" +" -m \tCố tiếp tục lại nếu không thể định vị kho\n" +" -u \tCũng hiện danh sách các gói đã _nâng cấp_\n" +" -b \t_Xây dụng_ gói nguồn sau khi lấy nó\n" +" -V \tHiện số thứ tự _phiên bản chi tiết_\n" +" -c=? \tĐọc tập tin cấu hình ấy\n" +" -o=? \tLập tùy chọn nhiệm ý, v.d. -o dir::cache=/tmp\n" +"Để tim thông tin và tùy chọn thêm thì hãy xem trang hướng dẫn apt-get(8), " +"sources.list(5) và apt.conf(5).\n" +" Trình APT này có năng lực của bò siêu.\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Lần tìm " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Lấy:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Bỏq " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Lỗi " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Mới lấy %sB trong %s (%sB/g).\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [Hoạt động]" + +#: cmdline/acqprogress.cc:271 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Chuyển đổi vật chứa: hãy nạp đĩa có nhãn\n" +" « %s »\n" +"vào ổ « %s » và bấm nút Enter\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Không biết mục ghi gói." + +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách sử dụng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chon « -s » dùng để ngụ ý kiểu tập tin.\n" +"\n" +"Tùy chọn:\n" +" -h \t_Trợ giúp_ này\n" +" -s \tSắp xếp những tập tin _nguồn_\n" +" -c=? \tĐọc tập tin cấu hình này\n" +" -o=? \tLập tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Thiết lập mặc định sai." + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "Hãy bấm phím Enter để tiếp tục lại." + +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình" + +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng" + +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"hoặc lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó. Không có sao, " +"chỉ những lỗi" + +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"ở trên thông điệp này là quan trọng. Hãy sửa chúng và chạy lại [I]nstall " +"(cài đặt)" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Đang hợp nhất các thông tin sẵn sàng..." + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Việc tạo những ống bị lỗi" + +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng." + +#: apt-inst/contrib/extracttar.cc:298 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s" + +#: apt-inst/contrib/arfile.cc:73 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" + +#: apt-inst/contrib/arfile.cc:81 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho" + +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +msgid "Invalid archive member header" +msgstr "Phần đầu bộ phạn kho không hợp lê" + +#: apt-inst/contrib/arfile.cc:131 +msgid "Archive is too short" +msgstr "Kho quá ngắn" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" + +#: apt-inst/filelist.cc:416 +msgid "Failed to locate the hash element!" +msgstr "Việc định vi phần tử băm bị lỗi" + +#: apt-inst/filelist.cc:463 +msgid "Failed to allocate diversion" +msgstr "Việc cấp phát sự trệch đi bị lỗi" + +#: apt-inst/filelist.cc:468 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" + +#: apt-inst/filelist.cc:481 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" + +#: apt-inst/filelist.cc:510 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" + +#: apt-inst/filelist.cc:553 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình trùng %s/%s" + +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#, c-format +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s bị lỗi" + +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#, c-format +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s bị lỗi" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài." + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" + +#: apt-inst/extract.cc:417 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" + +#: apt-inst/extract.cc:434 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" + +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#, c-format +msgid "Unable to read %s" +msgstr "Không thể đọc %s" + +#: apt-inst/extract.cc:494 +#, c-format +msgid "Unable to stat %s" +msgstr "Không thể lấy các thông tin về %s" + +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#, c-format +msgid "Failed to remove %s" +msgstr "Việc gỡ bỏ %s bị lỗi" + +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#, c-format +msgid "Unable to create %s" +msgstr "Không thể tạo %s" + +#: apt-inst/deb/dpkgdb.cc:118 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "Việc lấy các thông tin về %sinfo bị lỗi" + +#: apt-inst/deb/dpkgdb.cc:123 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "" +"Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ " +"thống tập tin" + +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 +#: apt-pkg/pkgcachegen.cc:840 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói..." + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 +msgid "Internal error getting a package name" +msgstr "Gặp lỗi nội bộ khi lấy tên gói" + +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +msgid "Reading file listing" +msgstr "Đang đọc danh sách tập tin..." + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi " +"tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói." + +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi" + +#: apt-inst/deb/dpkgdb.cc:266 +msgid "Internal error getting a node" +msgstr "Gặp lỗi nội bộ khi lấy nút điểm..." + +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi" + +#: apt-inst/deb/dpkgdb.cc:324 +msgid "The diversion file is corrupted" +msgstr "Tập tin trệch đi bị hỏng" + +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal error adding a diversion" +msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "Phải khởi động bộ nhớ tạm gói trước hết" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "" +"Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu" + +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »" + +#: apt-inst/deb/debfile.cc:52 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "" +"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »" + +#: apt-inst/deb/debfile.cc:112 +#, c-format +msgid "Couldn't change to %s" +msgstr "Không thể chuyển đổi sang %s" + +#: apt-inst/deb/debfile.cc:138 +msgid "Internal error, could not locate member" +msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn" + +#: apt-inst/deb/debfile.cc:171 +msgid "Failed to locate a valid control file" +msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi" + +#: apt-inst/deb/debfile.cc:256 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Không thể đọc cơ sở dữ liệu đĩa CD-ROM %s" + +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không " +"thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới." + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "CD không đúng" + +#: methods/cdrom.cc:164 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng." + +#: methods/cdrom.cc:169 +msgid "Disk not found." +msgstr "Không tìm thấy đĩa" + +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Không tìm thấy tập tin" + +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/gzip.cc:142 +msgid "Failed to stat" +msgstr "Việc lấy các thông tin bị lỗi" + +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +msgid "Failed to set modification time" +msgstr "Việc lập giờ sửa đổi bị lỗi" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "Địa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu với « // »" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Đang đăng nhập..." + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Không thể quyết định tên ngang hàng" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Không thể quyết định tên cục bộ" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. « " +"Acquire::ftp::ProxyLogin » là rỗng." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Thời hạn kết nối" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "Máy phục vụ đã đóng kết nối" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +msgid "Read error" +msgstr "Lỗi đọc" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Một trả lời đã tràn bộ đệm." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Giao thức bị hỏng" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +msgid "Write error" +msgstr "Lỗi ghi" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Không thể tạo ổ cắm" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "Không thể kết nối ổ cắm bị động." + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Không thể đóng kết ổ cắm" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "Không thể lắng nghe trên ổ cắm đó" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Không thể quyết định tên ổ cắm đó" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Không thể gởi lệnh PORT (cổng)" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Không biết nhóm địa chỉ %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Không thể chấp nhận kết nối" + +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Gặp khó khăn băm tập tin" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Ổ cắm dữ liệu đã quá giờ" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói « %s »" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Truy vấn" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "Không thể gọi " + +#: methods/connect.cc:64 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Đang kết nối đến %s (%s)..." + +#: methods/connect.cc:71 +#, c-format +msgid "[IP: %s %s]" +msgstr "[Địa chỉ IP: %s %s]" + +#: methods/connect.cc:80 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" + +#: methods/connect.cc:86 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." + +#: methods/connect.cc:93 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ" + +#: methods/connect.cc:108 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Không thể kết nối đến %s:%s (%s)." + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:136 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "Đang kết nối đến %s..." + +#: methods/connect.cc:167 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Không thể tháo gỡ « %s »" + +#: methods/connect.cc:173 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời" + +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" + +#: methods/connect.cc:223 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Không thể kết nối đến %s %s:" + +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Không thể tháo gỡ « %s »" + +#: methods/gpgv.cc:99 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát." + +#: methods/gpgv.cc:198 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!" + +#: methods/gpgv.cc:203 +msgid "At least one invalid signature was encountered." +msgstr "Gặp ít nhất một chữ ký không hợp lệ." + +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " để kiểm chứng chữ ký (gnupg có được cài đặt chưa?)" + +#: methods/gpgv.cc:212 +msgid "Unknown error executing gpgv" +msgstr "Gặp lỗi lạ khi thực hiện gpgv" + +#: methods/gpgv.cc:243 +msgid "The following signatures were invalid:\n" +msgstr "Những chữ ký theo đây là không hợp lệ:\n" + +#: methods/gpgv.cc:250 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n" + +#: methods/gzip.cc:57 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Không thể mở ống dẫn cho %s" + +#: methods/gzip.cc:102 +#, c-format +msgid "Read error from %s process" +msgstr "Gặp lỗi đọc từ tiến trình %s" + +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "Đang đợi những phần đầu..." + +#: methods/http.cc:522 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự" + +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "Dòng đầu sai" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" +"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không " +"hợp lệ" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" +"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không " +"hợp lệ" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "Không biết dạng ngày" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "Việc chọn bị lỗi" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "Kết nối đã quá giờ" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "Gặp lỗi khi ghi vào tập tin xuất" + +#: methods/http.cc:832 +msgid "Error writing to file" +msgstr "Gặp lỗi khi ghi vào tập tin" + +#: methods/http.cc:860 +msgid "Error writing to the file" +msgstr "Gặp lỗi khi ghi vào tập tin đó" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "Gặp lỗi khi đọc từ máy phục vụ" + +#: methods/http.cc:1107 +msgid "Bad header data" +msgstr "Dữ liệu dòng đầu sai" + +#: methods/http.cc:1124 +msgid "Connection failed" +msgstr "Kết nối bị ngắt" + +#: methods/http.cc:1215 +msgid "Internal error" +msgstr "Gặp lỗi nội bộ" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" + +#: apt-pkg/contrib/strutl.cc:938 +#, c-format +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" + +#: apt-pkg/contrib/configuration.cc:436 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không nhận biết viết tắt kiểu: « %c »" + +#: apt-pkg/contrib/configuration.cc:494 +#, c-format +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." + +#: apt-pkg/contrib/configuration.cc:512 +#, c-format +msgid "Line %d too long (max %d)" +msgstr "Dòng %d quá dài (tối đa %d)" + +#: apt-pkg/contrib/configuration.cc:608 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." + +#: apt-pkg/contrib/configuration.cc:627 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" + +#: apt-pkg/contrib/configuration.cc:644 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" + +#: apt-pkg/contrib/configuration.cc:684 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu" + +#: apt-pkg/contrib/configuration.cc:691 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" + +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" + +#: apt-pkg/contrib/configuration.cc:704 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" + +#: apt-pkg/contrib/progress.cc:154 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi." + +#: apt-pkg/contrib/progress.cc:156 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Xong" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Không biết tùy chọn dòng lệnh « %c » [từ %s]." + +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Không hiểu tùy chọn dòng lệnh %s" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)" + +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#, c-format +msgid "Option %s requires an argument." +msgstr "Tùy chọn %s cần đến một đối số." + +#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « =<giá_trị> »." + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải « %s »" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "Tùy chọn « %s » quá dài" + +#: apt-pkg/contrib/cmndline.cc:301 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)." + +#: apt-pkg/contrib/cmndline.cc:351 +#, c-format +msgid "Invalid operation %s" +msgstr "Thao tác không hợp lệ %s" + +#: apt-pkg/contrib/cdromutl.cc:55 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" + +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#, c-format +msgid "Unable to change to %s" +msgstr "Không thể chuyển đổi sang %s" + +#: apt-pkg/contrib/cdromutl.cc:190 +msgid "Failed to stat the cdrom" +msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" + +#: apt-pkg/contrib/fileutl.cc:82 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" + +#: apt-pkg/contrib/fileutl.cc:87 +#, c-format +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" + +#: apt-pkg/contrib/fileutl.cc:105 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" + +#: apt-pkg/contrib/fileutl.cc:109 +#, c-format +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" + +#: apt-pkg/contrib/fileutl.cc:377 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "Đã đợi %s nhưng mà chưa gặp nó" + +#: apt-pkg/contrib/fileutl.cc:387 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." + +#: apt-pkg/contrib/fileutl.cc:390 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" + +#: apt-pkg/contrib/fileutl.cc:392 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất ngờ" + +#: apt-pkg/contrib/fileutl.cc:436 +#, c-format +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" + +#: apt-pkg/contrib/fileutl.cc:492 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" + +#: apt-pkg/contrib/fileutl.cc:522 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "ghi, còn cần ghi %lu nhưng mà không thể" + +#: apt-pkg/contrib/fileutl.cc:597 +msgid "Problem closing the file" +msgstr "Gặp lỗi khi đóng tập tin đó" + +#: apt-pkg/contrib/fileutl.cc:603 +msgid "Problem unlinking the file" +msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" + +#: apt-pkg/contrib/fileutl.cc:614 +msgid "Problem syncing the file" +msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" + +#: apt-pkg/pkgcache.cc:126 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói rỗng" + +#: apt-pkg/pkgcache.cc:132 +msgid "The package cache file is corrupted" +msgstr "Tập tin bộ nhớ tạm gói bị hỏng" + +#: apt-pkg/pkgcache.cc:137 +msgid "The package cache file is an incompatible version" +msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích" + +#: apt-pkg/pkgcache.cc:142 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »" + +#: apt-pkg/pkgcache.cc:147 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác" + +#: apt-pkg/pkgcache.cc:218 +msgid "Depends" +msgstr "Phụ thuộc" + +#: apt-pkg/pkgcache.cc:218 +msgid "PreDepends" +msgstr "Phụ thuộc trước" + +#: apt-pkg/pkgcache.cc:218 +msgid "Suggests" +msgstr "Đệ nghị" + +#: apt-pkg/pkgcache.cc:219 +msgid "Recommends" +msgstr "Khuyên" + +#: apt-pkg/pkgcache.cc:219 +msgid "Conflicts" +msgstr "Xung đột" + +#: apt-pkg/pkgcache.cc:219 +msgid "Replaces" +msgstr "Thay thế" + +#: apt-pkg/pkgcache.cc:220 +msgid "Obsoletes" +msgstr "Làm cũ" + +#: apt-pkg/pkgcache.cc:231 +msgid "important" +msgstr "quan trọng" + +#: apt-pkg/pkgcache.cc:231 +msgid "required" +msgstr "cần" + +#: apt-pkg/pkgcache.cc:231 +msgid "standard" +msgstr "chuẩn" + +#: apt-pkg/pkgcache.cc:232 +msgid "optional" +msgstr "tùy chọn" + +#: apt-pkg/pkgcache.cc:232 +msgid "extra" +msgstr "thêm" + +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +msgid "Building dependency tree" +msgstr "Đang xây dụng cây cách phụ thuộc..." + +#: apt-pkg/depcache.cc:61 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" + +#: apt-pkg/depcache.cc:90 +msgid "Dependency generation" +msgstr "Tạo ra cách phụ thuộc" + +#: apt-pkg/tagfile.cc:72 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Không thể phân tách tập tin gói %s (1)" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Không thể phân tách tập tin gói %s (2)" + +#: apt-pkg/sourcelist.cc:94 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" +"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)." + +#: apt-pkg/sourcelist.cc:105 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" + +#: apt-pkg/sourcelist.cc:112 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" +"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)" + +#: apt-pkg/sourcelist.cc:203 +#, c-format +msgid "Opening %s" +msgstr "Đang mở %s..." + +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Dòng %u quá dài trong danh sách nguồn %s." + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." + +#: apt-pkg/sourcelist.cc:244 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s." + +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" + +#: apt-pkg/packagemanager.cc:402 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vong lăp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak " +"» (buộc ngắt vòng lặp)." + +#: apt-pkg/pkgrecords.cc:37 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »" + +#: apt-pkg/algorithms.cc:241 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." + +#: apt-pkg/algorithms.cc:1059 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " +"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." + +#: apt-pkg/algorithms.cc:1061 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." + +#: apt-pkg/acquire.cc:62 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Thiếu thư mục danh sách « %spartial »." + +#: apt-pkg/acquire.cc:66 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Thiếu thư mục kho « %spartial »." + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Đang tải về tập tin %li trên %li (%s còn lại)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Đang đọc danh sách tập tin..." + +#: apt-pkg/acquire-worker.cc:113 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Không tìm thấy trình điều khiển phương pháp %s." + +#: apt-pkg/acquire-worker.cc:162 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Phương pháp %s đã không bắt đầu cho đúng." + +#: apt-pkg/acquire-worker.cc:377 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." + +#: apt-pkg/init.cc:120 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói « %s »" + +#: apt-pkg/init.cc:136 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" + +#: apt-pkg/clean.cc:61 +#, c-format +msgid "Unable to stat %s." +msgstr "Không thể lấy các thông tin về %s." + +#: apt-pkg/srcrecords.cc:48 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" +"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách " +"nguồn)" + +#: apt-pkg/cachefile.cc:73 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái." + +#: apt-pkg/cachefile.cc:77 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này" + +#: apt-pkg/policy.cc:269 +msgid "Invalid record in the preferences file, no Package header" +msgstr "" +"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package " +"(Gói)." + +#: apt-pkg/policy.cc:291 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" + +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" + +#: apt-pkg/pkgcachegen.cc:74 +msgid "Cache has an incompatible versioning system" +msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:210 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:213 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "" +"Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là " +"một tập tin)" + +#: apt-pkg/pkgcachegen.cc:260 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin" + +#: apt-pkg/pkgcachegen.cc:574 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" + +#: apt-pkg/pkgcachegen.cc:658 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" + +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +msgid "IO Error saving source cache" +msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" + +#: apt-pkg/acquire-item.cc:126 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." + +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +msgid "MD5Sum mismatch" +msgstr "MD5Sum (tổng kiểm) không khớp được" + +#: apt-pkg/acquire-item.cc:640 +msgid "There are 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 ID khóa theo đây:\n" + +#: apt-pkg/acquire-item.cc:753 +#, 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 "" +"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:812 +#, c-format +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" +"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." + +#: apt-pkg/acquire-item.cc:848 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " +"tin:) cho gói %s." + +#: apt-pkg/acquire-item.cc:935 +msgid "Size mismatch" +msgstr "Kích cỡ không khớp được" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" + +#: apt-pkg/cdrom.cc:507 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"Đang dùng điểm lắp đĩa CD-ROM %s\n" +"Đang lắp đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +msgid "Identifying.. " +msgstr "Đang nhận diện... " + +#: apt-pkg/cdrom.cc:541 +#, c-format +msgid "Stored label: %s \n" +msgstr "Nhãn đã lưu : %s\n" + +#: apt-pkg/cdrom.cc:561 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n" + +#: apt-pkg/cdrom.cc:579 +msgid "Unmounting CD-ROM\n" +msgstr "Đang tháo lắp đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:583 +msgid "Waiting for disc...\n" +msgstr "Đang đợi đĩa...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:591 +msgid "Mounting CD-ROM...\n" +msgstr "Đang lắp đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:609 +msgid "Scanning disc for index files..\n" +msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" + +#: apt-pkg/cdrom.cc:647 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n" + +#: apt-pkg/cdrom.cc:710 +msgid "That is not a valid name, try again.\n" +msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" + +#: apt-pkg/cdrom.cc:726 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Tên đĩa này:\n" +"%s\n" + +#: apt-pkg/cdrom.cc:730 +msgid "Copying package lists..." +msgstr "Đang sao chép các danh sách gói..." + +#: apt-pkg/cdrom.cc:754 +msgid "Writing new source list\n" +msgstr "Đang ghi danh sách nguồn mới...\n" + +#: apt-pkg/cdrom.cc:763 +msgid "Source list entries for this disc are:\n" +msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" + +#: apt-pkg/cdrom.cc:803 +msgid "Unmounting CD-ROM..." +msgstr "Đang tháo lắp đĩa CD-ROM..." + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "Mới ghi %i mục ghi.\n" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" + +#: apt-pkg/deb/dpkgpm.cc:358 +#, c-format +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s..." + +#: apt-pkg/deb/dpkgpm.cc:359 +#, c-format +msgid "Unpacking %s" +msgstr "Đang mở gói %s..." + +#: apt-pkg/deb/dpkgpm.cc:364 +#, c-format +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s..." + +#: apt-pkg/deb/dpkgpm.cc:365 +#, c-format +msgid "Configuring %s" +msgstr "Đang cấu hình %s..." + +#: apt-pkg/deb/dpkgpm.cc:366 +#, c-format +msgid "Installed %s" +msgstr "Đã cài đặt %s" + +#: apt-pkg/deb/dpkgpm.cc:371 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s..." + +#: apt-pkg/deb/dpkgpm.cc:372 +#, c-format +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s..." + +#: apt-pkg/deb/dpkgpm.cc:373 +#, c-format +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" + +#: apt-pkg/deb/dpkgpm.cc:378 +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị cấu hình %s..." + +#: apt-pkg/deb/dpkgpm.cc:379 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Việc gỡ bỏ %s bị lỗi" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Kết nối bị đóng quá sớm." + +#~ msgid "Reading file list" +#~ msgstr "Đang đọc danh sách tâp tin..." + +#~ msgid "Could not execute " +#~ msgstr "Không thể thực hiện " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Đang chuẩn bị gỡ bỏ với cấu hình %s..." + +#~ msgid "Removed with config %s" +#~ msgstr "Mới gỡ bỏ với cấu hình %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1a4759955..f887f3328 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,16 +1,16 @@ # Chinese/Simplified translation of apt. # This file is put in the public domain. -# Tchaikov <chaisave@263.net>, 2004. -# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004. +# Tchaikov <tchaikov@sjtu.edu.cn>, 2005. +# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006 # msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-02-09 17:34+0800\n" -"Last-Translator: Tchaikov <chaisave@263.net>\n" -"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"PO-Revision-Date: 2006-02-22 14:20+1300\n" +"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" +"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,14 +146,14 @@ msgstr " 版本列表：" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -206,11 +206,11 @@ msgstr "" " showsrc - 显示源文件的各项记录\n" " stats - 显示一些基本的统计信息\n" " dump - 简要显示整个缓存文件的内容\n" -" dumpavail - 把所有有效的包文件列表打印到 stdout\n" +" dumpavail - 把所有有效的包文件列表打印到标准输出\n" " unmet - 显示所有未满足的依赖关系\n" " search - 根据正则表达式搜索软件包列表\n" -" show - 显示关于该软件包的便于阅读的一个报告\n" -" depends - 原原本本的显示该软件包的依赖关系的信息\n" +" show - 以便于阅读的格式介绍该软件包\n" +" depends - 原原本本地显示该软件包的依赖信息\n" " rdepends - 显示所有依赖于该软件包的软件包名字\n" " pkgnames - 列出所有软件包的名字\n" " dotty - 生成可用 GraphVis 处理的软件包关系图\n" @@ -227,6 +227,18 @@ msgstr "" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "请把光盘碟片插入驱动器再按回车键" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "请对您的光盘套件中的其它光盘重复相同的操作。" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "参数没有成对" @@ -284,7 +296,7 @@ msgstr "" "\n" "选项：\n" " -h 本帮助文本\n" -" -t 设置temp目录\n" +" -t 设置 temp 目录\n" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" @@ -322,7 +334,6 @@ msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -372,8 +383,8 @@ msgstr "" " clean 配置文件\n" "\n" "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n" -"多种生成索引的方式，从全自动的生成到在功能上对 dpkg-scanpackages \n" -"和 dpkg-scansources 的替代，都能游刃有余\n" +"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n" +"和 dpkg-scansources，都能游刃有余\n" "\n" "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n" "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n" @@ -394,7 +405,8 @@ msgstr "" " -h 本帮助文档\n" " --md5 使之生成 MD5 校验和\n" " -s=? 源代码包 override 文件\n" -" -q 输出精简信息 -d=? 指定可选的缓存数据库\n" +" -q 输出精简信息\n" +" -d=? 指定可选的缓存数据库\n" " -d=? 使用另一个可选的缓存数据库\n" " --no-delink 开启delink的调试模式\n" " --contents 使之生成控制内容文件\n" @@ -500,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "无法读取 %s 的状态" @@ -509,12 +521,12 @@ msgstr "无法读取 %s 的状态" msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" @@ -614,257 +626,255 @@ msgstr "在 unlink %s 时出错" msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系：" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "但却无法安装它" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变：" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级：" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:544 -#, fuzzy +#: cmdline/apt-get.cc:546 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "【警告】：下列的重要软件包将被卸载 \n" -"请勿尝试，除非您确实清楚您正在执行的操作！" +"请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "无法使升级的软件包集最小化" +msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "【警告】：下列的软件包不能通过认证！" +msgstr "【警告】：下列的软件包不能通过验证！" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" -msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。" +msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:773 -#, fuzzy +#: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "添加 diversion 时出现内部错误" +msgstr "内部错误，Ordering 没有完成" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "您在 %s 上没有足够的空余空间" +msgstr "无法获知您在 %s 上的空余空间" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:866 -#, fuzzy, c-format +#: cmdline/apt-get.cc:868 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"您的操作会导致潜在的危害\n" +"您的操作会导致潜在的危害。\n" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -872,47 +882,47 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "放弃安装。" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，我选了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -923,74 +933,74 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" -msgstr "内部错误，AllUpgrade 造成某些故障" +msgstr "内部错误，AllUpgrade 坏事了" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -998,7 +1008,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1009,7 +1019,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1018,122 +1028,126 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "下列的信息可能会对问题的解决有所帮助：" +msgstr "下列的信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" -msgstr "受损安装包" +msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "将会安装下列的额外的软件包：" +msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "内部错误，AllUpgrade 造成某些故障" +msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "忽略已下载过的文件“%s”\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, 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:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1142,30 +1156,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1411,11 +1425,11 @@ msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -1468,7 +1482,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@ -1514,7 +1529,7 @@ msgstr "无法切换工作目录到 admin 目录 %sinfo" msgid "Internal error getting a package name" msgstr "在获取软件包名字时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "正在读取文件列表" @@ -1560,10 +1575,6 @@ msgstr "添加 diversion 时出现内部错误" msgid "The pkg cache must be initialized first" msgstr "必须首先初始化软件包缓存" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "正在读取文件列表" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1626,23 +1637,22 @@ msgstr "错误的光盘" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。" +msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "无法找到该文件" +msgstr "找不到光盘。" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1769,7 +1779,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1792,7 +1802,7 @@ msgstr "数据传送出错，服务器响应道“%s”" msgid "Query" msgstr "查询" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "无法调用 " @@ -1821,75 +1831,74 @@ msgstr "无法发起与 %s:%s (%s) 的连接" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "解析“%s:%s”时，出现了某些故障 (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "无法解析域名“%s”" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "至少发现一个无效的签名。" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "无法获得锁 %s" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "用于验证签名(您安装了 gnupg 么？)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "将会安装下列的额外的软件包：" +msgstr "下列签名无效：\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "" +msgstr "由于没有公钥，下列签名无法进行验证：\n" #: methods/gzip.cc:57 #, c-format @@ -1901,76 +1910,76 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "内部错误" @@ -1983,7 +1992,7 @@ msgstr "无法 mmap 一个空文件" msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "没有发现您的所选 %s" @@ -2104,7 +2113,7 @@ msgstr "无效的操作 %s" msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@ -2261,62 +2270,62 @@ msgstr "候选版本" msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" @@ -2367,10 +2376,17 @@ msgstr "软件包列表的目录 %spartial 不见了。" msgid "Archive directory %spartial is missing." msgstr "找不到“%spartial”这个目录。" -#: apt-pkg/acquire.cc:817 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "正在读取文件列表" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2383,19 +2399,16 @@ msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"更换介质：请把标有\n" -"“%s”\n" -"的碟片插入驱动器“%s”再按回车键\n" +msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2406,7 +2419,7 @@ msgstr "无法读取 %s 的状态。" #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL" +msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2513,11 +2526,15 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "以下 key ID 没有可用的公钥：\n" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2526,7 +2543,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2534,13 +2551,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" +msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "大小不符" @@ -2644,59 +2661,71 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "正在打开 %s" +msgstr "正在准备 %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "正在打开 %s" +msgstr "正在解压缩 %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "正在打开配置文件 %s" +msgstr "正在准备配置 %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "正在连接 %s" +msgstr "正在配置 %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " 已安装：" +msgstr "已安装 %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "正在准备 %s 的删除操作" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "正在打开 %s" +msgstr "正在删除 %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "推荐" +msgstr "已删除 %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "正在准备配置 %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "无法删除 %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "Reading file list" +#~ msgstr "正在读取文件列表" + +#~ msgid "Could not execute " +#~ msgstr "未能执行 " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "正在准备连同配置文件的删除 %s" + +#~ msgid "Removed with config %s" +#~ msgstr "连同配置文件一同删除 %s " + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%" diff --git a/po/zh_TW.po b/po/zh_TW.po index c9f4657ca..e9e27bbf1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" +"POT-Creation-Date: 2006-05-16 07:33-0500\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -147,14 +147,14 @@ msgstr " 版本表格:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -228,6 +228,22 @@ msgstr "" " -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n" "若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +#, fuzzy +msgid "Please insert a Disc in the drive and press enter" +msgstr "" +"更換媒體:請把名為\n" +" '%s' 的光碟\n" +"插入 '%s' 碟機,然後按 [Enter] 鍵。\n" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "參數並非一對" @@ -502,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" @@ -511,12 +527,12 @@ msgstr "無法取得 %s 的狀態" msgid "Archive had no package field" msgstr "檔案無套件字符" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s 無 override 項目\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" @@ -616,79 +632,79 @@ msgstr "在 unlink %s 時出錯" msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:120 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有無法滿足的依存關係：" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" msgstr "但是『%s』卻已經安裝好了。" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" msgstr "但是『%s』卻將被安裝。" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:336 msgid "but it is not installable" msgstr "但是它卻無法安裝。" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:338 msgid "but it is a virtual package" msgstr "但是它只是虛擬的套件" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not installed" msgstr "但是『%s』卻還沒有安裝。" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" msgstr "但是它卻不會被安裝。" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:346 msgid " or" msgstr "或" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" msgstr "下列的套件都將被【刪除】：" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" msgstr "下列的套件都將維持舊版本:" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" msgstr "下列的套件都將更新:" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" msgstr "下列的套件都將被「降級」:" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" msgstr "下列押後的套件都將被更改：" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:546 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -697,144 +713,144 @@ msgstr "" "警告：下列的重要套件都將被刪除\n" "除非您很清楚在做什麼，請勿輕易嘗試。" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個套件，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " msgstr "降 %lu 個套件的版，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." msgstr "更正依存關係中..." -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:652 msgid " failed." msgstr "失敗" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" msgstr "無法更正依存關係。" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升級的套件集合" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:660 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足相依關係。試試看 -f 選項。" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告：下列的套件驗證失敗！" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " msgstr "不驗證這些套件就直接安裝？[y/N]" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" msgstr "部份套件無法驗證" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤：新增轉移(diversion)失敗" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的檔案。\n" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓縮後將消耗 %sB 的空間。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:868 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -845,28 +861,28 @@ msgstr "" "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "放棄執行。" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:986 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -874,47 +890,47 @@ msgstr "" "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" "選項?" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." msgstr "無法更正遺失的套件。" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:996 msgid "Aborting install." msgstr "放棄安裝。" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,選擇了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝，所以無法刪除。\n" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提供者是：\n" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1081 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1091 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -925,73 +941,73 @@ msgstr "" "這可能意味著這個套件已經消失或捨棄,\n" "或者只能在其他原碼中找到\n" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" msgstr "但是下列的套件將取代它：" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可供安裝的候選版本" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安裝 %s,因為無法下載它。\n" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”發布版本" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1284 +#: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1355 +#: cmdline/apt-get.cc:1384 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -999,7 +1015,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: cmdline/apt-get.cc:1541 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1010,7 +1026,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1020,122 +1036,127 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1554 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1654 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1950 +#, fuzzy, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" + +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1944 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:2003 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2015 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2016 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2033 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2052 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" -#: cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:2212 #, 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:2220 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1144,30 +1165,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: cmdline/apt-get.cc:2255 +#: cmdline/apt-get.cc:2299 #, 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:2280 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "支援模組:" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1419,7 +1440,7 @@ msgstr "重複的設定檔 %s/%s" msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -1472,7 +1493,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" @@ -1518,7 +1540,7 @@ msgstr "無法變換 admin 目錄至 %sinfo" msgid "Internal error getting a package name" msgstr "內部錯誤，無法取得套件名稱" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "讀取軟件表中" @@ -1564,10 +1586,6 @@ msgstr "內部錯誤：新增轉移(diversion)失敗" msgid "The pkg cache must be initialized first" msgstr "套件快取必須先初始化" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "讀取軟件表中" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1641,12 +1659,12 @@ msgstr "找不到檔案" msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "無法讀取資料" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "日期更新失敗" @@ -1772,7 +1790,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1795,7 +1813,7 @@ msgstr "資料傳輸失敗，伺服器回應 %s" msgid "Query" msgstr "查詢" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "無法讀取 " @@ -1824,71 +1842,71 @@ msgstr "無法聯絡到主機『%s:%s (%s)』。" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "聯絡主機『%s』中" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "無法解析位置 %s" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "解析『%s』暫時失敗" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "無法解析『%s:%s (%i)』。" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "無法聯絡到主機『%s %s』：" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "無法解析位置 %s" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "無法取得『%s』鎖。" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "下列的【新】套件都將被安裝：" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1904,76 +1922,76 @@ msgstr "無法開啟管線給 %s 使用" msgid "Read error from %s process" msgstr "從 %s 進程讀取錯誤" -#: methods/http.cc:344 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:490 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:498 +#: methods/http.cc:530 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:553 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:568 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:570 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:594 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:741 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:746 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:769 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:797 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:822 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:836 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:838 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1069 +#: methods/http.cc:1107 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1086 +#: methods/http.cc:1124 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1177 +#: methods/http.cc:1215 msgid "Internal error" msgstr "內部錯誤" @@ -1986,7 +2004,7 @@ msgstr "不能將空白檔案讀入記憶體" msgid "Couldn't make mmap of %lu bytes" msgstr "無法讀入檔案 %lu 位元組至記憶體" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "選項『%s』找不到。" @@ -2107,7 +2125,7 @@ msgstr "無效的操作：%s" msgid "Unable to stat the mount point %s" msgstr "無法讀取掛載點 %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%s』目錄。" @@ -2264,62 +2282,62 @@ msgstr "候選版本" msgid "Dependency generation" msgstr "產生套件依存關係" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件『%s』(1)。" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "開啟『%s』中" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "來源檔『%2$s』第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" -#: apt-pkg/sourcelist.cc:191 -#, c-format +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" @@ -2365,11 +2383,18 @@ msgstr "找不到『%spartial』清單目錄。" msgid "Archive directory %spartial is missing." msgstr "找不到『%spartial』檔案目錄。" -#: apt-pkg/acquire.cc:817 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "讀取軟件表中" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2388,12 +2413,12 @@ msgstr "" " '%s' 的光碟\n" "插入 '%s' 碟機,然後按 [Enter] 鍵。\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@ -2511,31 +2536,35 @@ msgstr "無法寫入來源暫存檔。" msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:640 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "檔案大小不符合。" @@ -2679,15 +2708,22 @@ msgid "Removed %s" msgstr "推薦" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "開啟組態檔 %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "無法移除 %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線不預期的結束" + +#~ msgid "Reading file list" +#~ msgstr "讀取軟件表中" + +#, fuzzy +#~ msgid "Could not execute " +#~ msgstr "無法取得『%s』鎖。" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg Binary files differindex c391d8fa1..ce412117d 100644 --- a/share/debian-archive.gpg +++ b/share/debian-archive.gpg diff --git a/share/debian-archive.gpg.moved.moved b/share/debian-archive.gpg.moved.moved Binary files differnew file mode 100644 index 000000000..bb5ed5033 --- /dev/null +++ b/share/debian-archive.gpg.moved.moved diff --git a/test/testdeb.cc b/test/testdeb.cc index 5986621bb..d28f20114 100644 --- a/test/testdeb.cc +++ b/test/testdeb.cc @@ -23,7 +23,7 @@ bool Test(const char *File) return false; // Extract it. - ExtractTar Tar(Deb.GetFile(),Member->Size); + ExtractTar Tar(Deb.GetFile(),Member->Size, "gzip"); NullStream Dir; if (Tar.Go(Dir) == false) return false; diff --git a/test/versions.lst b/test/versions.lst index 008a0f2d7..efc19c4f0 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -20,6 +20,13 @@ z . -1 # Epochs 1:0.4 10.3 1 1:1.25-4 1:1.25-8 -1 +0:1.18.36 1.18.36 0 + +# Funky, but allowed, characters in upstream version +9:1.18.36:5.4-20 10:0.5.1-22 -1 +9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1 +9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1 +1.18.36-0.17.35-18 1.18.36-19 1 # Junk 1:1.2.13-3 1:1.2.13-3.1 -1 |